diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index de0a686e..aa4062e9 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -2,7 +2,7 @@ Version 2.1.1 ------------------------------------------------------ Changes -- Added Enderminy Mob +- Added Enderminy Mob (Ollieedd) - #1071 Added recipes to make fused quartz and enlightened glass using quartz blocks and glowstone blocks (MatthiasMann) Bugs diff --git a/resources/assets/enderio/models/transceiver.obj b/resources/assets/enderio/models/transceiver.obj new file mode 100644 index 00000000..1909f5b8 --- /dev/null +++ b/resources/assets/enderio/models/transceiver.obj @@ -0,0 +1,1634 @@ +# This file uses centimeters as units for non-parametric coordinates. + +mtllib Hypercube.mtl +g default +v -7.000000 -7.000002 7.000000 +v 7.000000 -7.000002 7.000000 +v -7.000000 7.000000 7.000000 +v 7.000000 7.000000 7.000000 +v -7.000000 7.000000 -7.000000 +v 7.000000 7.000000 -7.000000 +v -7.000000 -7.000002 -7.000000 +v 7.000000 -7.000002 -7.000000 +v 7.000000 -5.000000 -5.000000 +v 7.000000 -5.000000 5.000000 +v 7.000000 5.000000 -5.000000 +v 7.000000 5.000000 5.000000 +v -7.000000 -5.000000 -5.000000 +v -7.000000 -5.000000 5.000000 +v -7.000000 5.000000 5.000000 +v -7.000000 5.000000 -5.000000 +v -5.000000 -5.000000 7.000000 +v 5.000000 -5.000000 7.000000 +v 5.000000 4.999999 7.000000 +v -5.000000 4.999999 7.000000 +v -5.000000 4.999999 -7.000000 +v 5.000000 4.999999 -7.000000 +v 5.000000 -5.000000 -7.000000 +v -5.000000 -5.000000 -7.000000 +v -5.000000 7.000000 5.000000 +v 5.000000 7.000000 5.000000 +v 5.000000 7.000000 -5.000000 +v -5.000000 7.000000 -5.000000 +v -5.000000 -7.000002 -5.000000 +v 5.000000 -7.000002 -5.000000 +v 5.000000 -7.000002 5.000000 +v -5.000000 -7.000002 5.000000 +v -4.000000 -4.000000 6.000002 +v 4.000000 -4.000000 6.000002 +v 4.000000 4.000000 6.000002 +v -4.000000 4.000000 6.000002 +v -4.000000 6.000002 4.000000 +v 4.000000 6.000002 4.000000 +v 4.000000 6.000002 -4.000000 +v -4.000000 6.000002 -4.000000 +v -4.000000 4.000000 -6.000002 +v 4.000000 4.000000 -6.000002 +v 4.000000 -4.000000 -6.000002 +v -4.000000 -4.000000 -6.000002 +v -4.000000 -6.000002 -4.000000 +v 4.000000 -6.000002 -4.000000 +v 4.000000 -6.000002 4.000000 +v -4.000000 -6.000002 4.000000 +v 6.000002 -4.000000 -4.000000 +v 6.000002 -4.000000 4.000000 +v 6.000002 4.000000 -4.000000 +v 6.000002 4.000000 4.000000 +v -6.000002 -4.000000 -4.000000 +v -6.000002 -4.000000 4.000000 +v -6.000002 4.000000 4.000000 +v -6.000002 4.000000 -4.000000 +v 5.000001 -5.000001 5.000000 +v -5.000001 -5.000001 5.000000 +v -5.000001 -5.000001 -5.000000 +v 5.000001 -5.000001 -5.000000 +v -5.000001 5.000001 5.000001 +v -5.000001 5.000001 -5.000001 +v 5.000001 5.000001 -5.000001 +v 5.000001 5.000001 5.000001 +v 8.000000 -4.000000 8.000000 +v 8.000000 -8.000000 8.000000 +v 4.000000 -8.000000 8.000000 +v 8.000000 -8.000000 4.000000 +v 6.000002 -4.000000 4.000000 +v 4.000000 -6.000002 4.000000 +v 4.000000 -4.000000 6.000002 +v 5.000000 -4.000000 8.000000 +v 5.000000 -8.000000 4.000000 +v 4.000000 -5.000000 8.000000 +v 4.000000 -8.000000 5.000000 +v 8.000000 -5.000000 4.000000 +v 8.000000 -4.000000 5.000000 +v 8.000000 -4.000000 -8.000000 +v 8.000000 -8.000000 -8.000000 +v 8.000000 -8.000000 -4.000000 +v 4.000000 -8.000000 -8.000000 +v 4.000000 -4.000000 -6.000002 +v 4.000000 -6.000002 -4.000000 +v 6.000002 -4.000000 -4.000000 +v 8.000000 -4.000000 -5.000000 +v 4.000000 -8.000000 -5.000000 +v 8.000000 -5.000000 -4.000000 +v 5.000000 -8.000000 -4.000000 +v 4.000000 -5.000000 -8.000000 +v 5.000000 -4.000000 -8.000000 +v -8.000000 -4.000000 -8.000000 +v -8.000000 -8.000000 -8.000000 +v -4.000000 -8.000000 -8.000000 +v -8.000000 -8.000000 -4.000000 +v -6.000002 -4.000000 -4.000000 +v -4.000000 -6.000002 -4.000000 +v -4.000000 -4.000000 -6.000002 +v -5.000000 -4.000000 -8.000000 +v -5.000000 -8.000000 -4.000000 +v -4.000000 -5.000000 -8.000000 +v -4.000000 -8.000000 -5.000000 +v -8.000000 -5.000000 -4.000000 +v -8.000000 -4.000000 -5.000000 +v -8.000000 -4.000000 8.000000 +v -8.000000 -8.000000 8.000000 +v -8.000000 -8.000000 4.000000 +v -4.000000 -8.000000 8.000000 +v -4.000000 -4.000000 6.000002 +v -4.000000 -6.000002 4.000000 +v -6.000002 -4.000000 4.000000 +v -8.000000 -4.000000 5.000000 +v -4.000000 -8.000000 5.000000 +v -8.000000 -5.000000 4.000000 +v -5.000000 -8.000000 4.000000 +v -4.000000 -5.000000 8.000000 +v -5.000000 -4.000000 8.000000 +v 8.000000 4.000000 -8.000000 +v 8.000000 8.000000 -8.000000 +v 4.000000 8.000000 -8.000000 +v 8.000000 8.000000 -4.000000 +v 6.000002 4.000000 -4.000000 +v 4.000000 6.000002 -4.000000 +v 4.000000 4.000000 -6.000002 +v 5.000000 4.000000 -8.000000 +v 5.000000 8.000000 -4.000000 +v 4.000000 5.000000 -8.000000 +v 4.000000 8.000000 -5.000000 +v 8.000000 5.000000 -4.000000 +v 8.000000 4.000000 -5.000000 +v -8.000000 4.000000 -8.000000 +v -8.000000 8.000000 -8.000000 +v -8.000000 8.000000 -4.000000 +v -4.000000 8.000000 -8.000000 +v -4.000000 4.000000 -6.000002 +v -4.000000 6.000002 -4.000000 +v -6.000002 4.000000 -4.000000 +v -8.000000 4.000000 -5.000000 +v -4.000000 8.000000 -5.000000 +v -8.000000 5.000000 -4.000000 +v -5.000000 8.000000 -4.000000 +v -4.000000 5.000000 -8.000000 +v -5.000000 4.000000 -8.000000 +v -8.000000 4.000000 8.000000 +v -8.000000 8.000000 8.000000 +v -4.000000 8.000000 8.000000 +v -8.000000 8.000000 4.000000 +v -6.000002 4.000000 4.000000 +v -4.000000 6.000002 4.000000 +v -4.000000 4.000000 6.000002 +v -5.000000 4.000000 8.000000 +v -5.000000 8.000000 4.000000 +v -4.000000 5.000000 8.000000 +v -4.000000 8.000000 5.000000 +v -8.000000 5.000000 4.000000 +v -8.000000 4.000000 5.000000 +v 8.000000 4.000000 8.000000 +v 8.000000 8.000000 8.000000 +v 8.000000 8.000000 4.000000 +v 4.000000 8.000000 8.000000 +v 4.000000 4.000000 6.000002 +v 4.000000 6.000002 4.000000 +v 6.000002 4.000000 4.000000 +v 8.000000 4.000000 5.000000 +v 4.000000 8.000000 5.000000 +v 8.000000 5.000000 4.000000 +v 5.000000 8.000000 4.000000 +v 4.000000 5.000000 8.000000 +v 5.000000 4.000000 8.000000 +vt -0.198463 1.000000 +vt -0.198463 1.000000 +vt 0.999571 0.812500 +vt 0.999570 0.812500 +vt -0.198463 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.999570 0.812500 +vt -0.198463 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198464 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.999570 0.812500 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198464 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.999570 0.812500 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt 0.999570 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt 1.199242 1.000000 +vt 1.199242 1.000000 +vt 0.999570 0.812500 +vt 0.999570 0.812500 +vt 1.199244 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt 1.199244 1.000000 +vt 0.999570 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt 1.199242 1.000000 +vt 1.199242 1.000000 +vt 0.999570 0.812500 +vt 0.999570 0.812500 +vt 1.199244 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt 1.199244 1.000000 +vt 0.999571 0.812500 +vt 0.899734 0.687500 +vt 0.899734 0.687500 +vt -0.198463 1.000000 +vt 1.199244 1.000000 +vt 0.999570 0.593749 +vt 0.101046 0.500000 +vt 0.101046 0.499999 +vt 0.001209 0.593749 +vt 0.101045 0.500000 +vt 0.001209 0.593750 +vt 0.101045 0.500001 +vt 0.899734 0.499999 +vt 0.899734 0.500001 +vt 0.999571 0.593752 +vt 1.199242 1.000000 +vt 1.199242 1.000000 +vt 0.101045 0.500001 +vt 0.101045 0.687500 +vt 0.001209 0.593751 +vt 1.199242 1.000000 +vt 0.101045 0.687500 +vt 0.101045 0.500001 +vt 0.899734 0.499999 +vt 0.999570 0.593749 +vt 1.199242 1.000000 +vt -0.198463 1.000000 +vt 0.999571 0.593750 +vt 0.101045 0.687500 +vt 0.001209 0.593750 +vt 0.101045 0.500001 +vt 0.899734 0.500001 +vt 0.101046 0.499999 +vt 0.899734 0.500001 +vt 0.999571 0.593750 +vt 1.199242 1.000000 +vt 0.101045 0.687500 +vt 0.001210 0.593749 +vt -0.198463 1.000000 +vt 0.101045 0.687500 +vt 0.001209 0.593751 +vt 0.101045 0.500001 +vt -0.198463 1.000000 +vt 0.101046 0.687500 +vt 0.001209 0.593750 +vt 0.101046 0.500000 +vt 0.101045 0.500000 +vt 0.999571 0.593750 +vt 1.199242 1.000000 +vt 1.199242 1.000000 +vt 0.899734 0.500000 +vt 0.999571 0.593750 +vt 0.101045 0.687500 +vt 0.001209 0.593749 +vt 0.101045 0.499999 +vt 0.899734 0.500000 +vt 0.999571 0.593752 +vt 0.899734 0.500000 +vt 0.001209 0.593752 +vt 0.101045 0.687500 +vt 0.101045 0.687500 +vt 0.001209 0.593752 +vt 0.899734 0.500001 +vt 0.999571 0.593752 +vt 0.899734 0.500000 +vt 0.101045 0.687500 +vt 0.001209 0.593749 +vt 0.999571 0.593748 +vt 0.001209 0.593751 +vt 0.101045 0.687500 +vt 0.899734 0.499999 +vt 0.999571 0.593750 +vt 0.999570 0.593750 +vt 0.101045 0.687500 +vt 0.899734 0.500001 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt -0.198463 1.000000 +vt 0.001209 0.812500 +vt -0.198463 1.000000 +vt 0.001209 0.812500 +vt 1.199242 1.000000 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001210 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 1.199244 1.000000 +vt 0.001209 0.812500 +vt 1.199244 1.000000 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 1.199242 1.000000 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt 1.199242 1.000000 +vt 0.001209 0.812500 +vt -0.198463 1.000000 +vt 0.001209 0.812500 +vt 1.199244 1.000000 +vt 0.001209 0.812500 +vt 1.199242 1.000000 +vt 0.001209 0.812500 +vt 0.101045 0.687500 +vt 0.001209 0.812500 +vt -0.198463 1.000000 +vt 0.001209 0.812500 +vt 1.199242 1.000000 +vt 0.001209 0.812500 +vt 0.101046 0.687500 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.999606 0.000137 +vt 0.801796 0.000137 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.999607 0.000137 +vt 0.900517 0.296784 +vt 0.801796 0.000137 +vt 0.000000 0.049606 +vt 0.327308 0.049636 +vt -0.000000 0.500000 +vt 0.437491 0.160555 +vt 0.437509 0.500000 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt -0.000000 0.049606 +vt 0.437509 0.500000 +vt 0.327308 0.049636 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.437509 0.500000 +vt 0.437491 0.160555 +vt 0.771229 0.500000 +vt 0.660215 0.049606 +vt 0.882139 0.271633 +vt 0.000000 0.500000 +vt 0.327308 0.049636 +vt -0.000000 0.049606 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707106 0.707107 +vn 0.000000 0.707106 0.707107 +vn 0.000000 0.707106 0.707107 +vn 0.000000 0.707106 0.707107 +vn -0.707106 0.000000 0.707108 +vn -0.707106 0.000000 0.707108 +vn -0.707106 0.000000 0.707108 +vn -0.707106 0.000000 0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707107 -0.707106 +vn -0.707106 0.707107 0.000000 +vn -0.707106 0.707107 0.000000 +vn -0.707106 0.707107 0.000000 +vn -0.707106 0.707107 0.000000 +vn 0.000000 0.707107 0.707106 +vn 0.000000 0.707107 0.707106 +vn 0.000000 0.707107 0.707106 +vn 0.000000 0.707107 0.707106 +vn 0.707106 0.707107 0.000000 +vn 0.707106 0.707107 0.000000 +vn 0.707106 0.707107 0.000000 +vn 0.707106 0.707107 0.000000 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn -0.707106 0.000000 -0.707107 +vn -0.707106 0.000000 -0.707107 +vn -0.707106 0.000000 -0.707107 +vn -0.707106 0.000000 -0.707107 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 0.707106 -0.707107 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 -0.707107 0.707107 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 0.707106 0.000000 +vn 0.707107 0.707106 0.000000 +vn 0.707107 0.707106 0.000000 +vn 0.707107 0.707106 0.000000 +vn 0.707107 0.000000 0.707106 +vn 0.707107 0.000000 0.707106 +vn 0.707107 0.000000 0.707106 +vn 0.707107 0.000000 0.707106 +vn 0.707107 -0.707106 0.000000 +vn 0.707107 -0.707106 0.000000 +vn 0.707107 -0.707106 0.000000 +vn 0.707107 -0.707106 0.000000 +vn 0.707107 0.000000 -0.707106 +vn 0.707107 0.000000 -0.707106 +vn 0.707107 0.000000 -0.707106 +vn 0.707107 0.000000 -0.707106 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 -0.707106 0.000000 +vn -0.707107 -0.707106 0.000000 +vn -0.707107 -0.707106 0.000000 +vn -0.707107 -0.707106 0.000000 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.000001 0.707107 -0.707107 +vn -0.000000 0.707107 -0.707107 +vn -0.000000 0.707107 -0.707107 +vn 0.000000 0.707107 -0.707107 +vn 0.000000 0.707107 -0.707107 +vn 0.000000 0.707106 -0.707107 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.000001 0.707107 0.707107 +vn 0.000000 0.707107 0.707107 +vn 0.000000 0.707107 0.707107 +vn -0.000000 0.707107 0.707107 +vn -0.000000 0.707107 0.707107 +vn 0.000000 0.707106 0.707107 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn 0.707107 0.000001 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn -0.707107 0.000001 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707106 0.000000 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.666667 0.666667 0.333334 +vn -0.666667 0.666667 0.333334 +vn -0.666667 0.666667 0.333334 +vn 0.333334 0.666667 -0.666667 +vn 0.333334 0.666667 -0.666667 +vn 0.333334 0.666667 -0.666667 +vn -0.666667 -0.333334 -0.666667 +vn -0.666667 -0.333334 -0.666667 +vn -0.666667 -0.333334 -0.666667 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.333334 0.666667 0.666667 +vn 0.333334 0.666667 0.666667 +vn 0.333334 0.666667 0.666667 +vn -0.666667 0.666667 -0.333334 +vn -0.666667 0.666667 -0.333334 +vn -0.666667 0.666667 -0.333334 +vn -0.666667 -0.333334 0.666667 +vn -0.666667 -0.333334 0.666667 +vn -0.666667 -0.333334 0.666667 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.666667 0.666667 -0.333334 +vn 0.666667 0.666667 -0.333334 +vn 0.666667 0.666667 -0.333334 +vn -0.333334 0.666667 0.666667 +vn -0.333334 0.666667 0.666667 +vn -0.333334 0.666667 0.666667 +vn 0.666667 -0.333334 0.666667 +vn 0.666667 -0.333334 0.666667 +vn 0.666667 -0.333334 0.666667 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.333334 0.666667 -0.666667 +vn -0.333334 0.666667 -0.666667 +vn -0.333334 0.666667 -0.666667 +vn 0.666667 0.666667 0.333334 +vn 0.666667 0.666667 0.333334 +vn 0.666667 0.666667 0.333334 +vn 0.666667 -0.333334 -0.666667 +vn 0.666667 -0.333334 -0.666667 +vn 0.666667 -0.333334 -0.666667 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.666667 -0.666667 -0.333334 +vn -0.666667 -0.666667 -0.333334 +vn -0.666667 -0.666667 -0.333334 +vn 0.333334 -0.666667 0.666667 +vn 0.333334 -0.666667 0.666667 +vn 0.333334 -0.666667 0.666667 +vn -0.666667 0.333334 0.666667 +vn -0.666667 0.333334 0.666667 +vn -0.666667 0.333334 0.666667 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.333334 -0.666667 0.666667 +vn -0.333334 -0.666667 0.666667 +vn -0.333334 -0.666667 0.666667 +vn 0.666667 -0.666667 -0.333334 +vn 0.666667 -0.666667 -0.333334 +vn 0.666667 -0.666667 -0.333334 +vn 0.666667 0.333334 0.666667 +vn 0.666667 0.333334 0.666667 +vn 0.666667 0.333334 0.666667 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.666667 -0.666667 0.333334 +vn 0.666667 -0.666667 0.333334 +vn 0.666667 -0.666667 0.333334 +vn -0.333334 -0.666667 -0.666667 +vn -0.333334 -0.666667 -0.666667 +vn -0.333334 -0.666667 -0.666667 +vn 0.666667 0.333334 -0.666667 +vn 0.666667 0.333334 -0.666667 +vn 0.666667 0.333334 -0.666667 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.333334 -0.666667 -0.666667 +vn 0.333334 -0.666667 -0.666667 +vn 0.333334 -0.666667 -0.666667 +vn -0.666667 -0.666667 0.333334 +vn -0.666667 -0.666667 0.333334 +vn -0.666667 -0.666667 0.333334 +vn -0.666667 0.333334 -0.666667 +vn -0.666667 0.333334 -0.666667 +vn -0.666667 0.333334 -0.666667 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +s 1 +g polySurface1 +usemtl initialShadingGroup +f 2/184/1 8/2/2 10/4/3 +f 10/4/3 8/2/2 9/159/4 +s 2 +f 8/182/5 6/5/6 9/3/7 +f 9/3/7 6/5/6 11/155/8 +s 3 +f 6/164/9 4/9/10 11/6/11 +f 11/6/11 4/9/10 12/153/12 +s 4 +f 4/166/13 2/1/14 12/10/15 +f 12/10/15 2/1/14 10/157/16 +s 5 +f 7/172/17 1/14/18 13/16/19 +f 13/16/19 1/14/18 14/149/20 +s 6 +f 1/178/21 3/17/22 14/15/23 +f 14/15/23 3/17/22 15/147/24 +s 7 +f 3/190/25 5/21/26 15/18/27 +f 15/18/27 5/21/26 16/145/28 +s 8 +f 5/152/29 7/13/30 16/22/31 +f 16/22/31 7/13/30 13/151/32 +s 9 +f 1/119/33 2/26/34 17/28/35 +f 17/28/35 2/26/34 18/189/36 +s 10 +f 2/118/37 4/29/38 18/27/39 +f 18/27/39 4/29/38 19/187/40 +s 11 +f 4/95/41 3/33/42 19/30/43 +f 19/30/43 3/33/42 20/185/44 +s 12 +f 3/85/45 1/25/46 20/34/47 +f 20/34/47 1/25/46 17/191/48 +s 13 +f 5/105/49 6/38/50 21/40/51 +f 21/40/51 6/38/50 22/173/52 +s 14 +f 6/86/53 8/41/54 22/39/55 +f 22/39/55 8/41/54 23/171/56 +s 15 +f 8/90/57 7/45/58 23/42/59 +f 23/42/59 7/45/58 24/169/60 +s 16 +f 7/74/61 5/37/62 24/46/63 +f 24/46/63 5/37/62 21/175/64 +s 17 +f 3/49/65 4/150/66 25/52/67 +f 25/52/67 4/150/66 26/181/68 +s 18 +f 4/50/69 6/96/70 26/51/71 +f 26/51/71 6/96/70 27/179/72 +s 19 +f 6/53/73 5/148/74 27/54/75 +f 27/54/75 5/148/74 28/177/76 +s 20 +f 5/57/77 3/73/78 28/58/79 +f 28/58/79 3/73/78 25/183/80 +s 21 +f 7/61/81 8/188/82 29/64/83 +f 29/64/83 8/188/82 30/165/84 +s 22 +f 8/62/85 2/108/86 30/63/87 +f 30/63/87 2/108/86 31/163/88 +s 23 +f 2/65/89 1/180/90 31/66/91 +f 31/66/91 1/180/90 32/161/92 +s 24 +f 1/69/93 7/112/94 32/70/95 +f 32/70/95 7/112/94 29/167/96 +s 25 +f 17/28/97 18/189/98 33/32/99 +f 33/32/99 18/189/98 34/135/100 +s 26 +f 18/27/101 19/187/102 34/31/103 +f 34/31/103 19/187/102 35/130/104 +s 27 +f 19/30/105 20/185/106 35/35/107 +f 35/35/107 20/185/106 36/186/108 +s 28 +f 20/34/109 17/191/110 36/36/111 +f 36/36/111 17/191/110 33/192/112 +s 29 +f 25/52/113 26/181/114 37/56/115 +f 37/56/115 26/181/114 38/91/116 +s 30 +f 26/51/117 27/179/118 38/55/119 +f 38/55/119 27/179/118 39/139/120 +s 31 +f 27/54/121 28/177/122 39/59/123 +f 39/59/123 28/177/122 40/122/124 +s 32 +f 28/58/125 25/183/126 40/60/127 +f 40/60/127 25/183/126 37/109/128 +s 33 +f 21/40/129 22/173/130 41/44/131 +f 41/44/131 22/173/130 42/174/132 +s 34 +f 22/39/133 23/171/134 42/43/135 +f 42/43/135 23/171/134 43/113/136 +s 35 +f 23/42/137 24/169/138 43/47/139 +f 43/47/139 24/169/138 44/170/140 +s 36 +f 24/46/141 21/175/142 44/48/143 +f 44/48/143 21/175/142 41/176/144 +s 37 +f 29/64/145 30/165/146 45/68/147 +f 45/68/147 30/165/146 46/129/148 +s 38 +f 30/63/149 31/163/150 46/67/151 +f 46/67/151 31/163/150 47/98/152 +s 39 +f 31/66/153 32/161/154 47/71/155 +f 47/71/155 32/161/154 48/162/156 +s 40 +f 32/70/157 29/167/158 48/72/159 +f 48/72/159 29/167/158 45/168/160 +s 41 +f 10/4/161 9/159/162 50/8/163 +f 50/8/163 9/159/162 49/160/164 +s 42 +f 9/3/165 11/155/166 49/7/167 +f 49/7/167 11/155/166 51/156/168 +s 43 +f 11/6/169 12/153/170 51/11/171 +f 51/11/171 12/153/170 52/154/172 +s 44 +f 12/10/173 10/157/174 52/12/175 +f 52/12/175 10/157/174 50/158/176 +s 45 +f 13/16/177 14/149/178 53/20/179 +f 53/20/179 14/149/178 54/143/180 +s 46 +f 14/15/181 15/147/182 54/19/183 +f 54/19/183 15/147/182 55/88/184 +s 47 +f 15/18/185 16/145/186 55/23/187 +f 55/23/187 16/145/186 56/146/188 +s 48 +f 16/22/189 13/151/190 56/24/191 +f 56/24/191 13/151/190 53/106/192 +s 49 +f 57/136/193 47/76/194 34/135/195 +f 34/135/195 47/76/194 33/32/196 +f 33/32/196 47/76/194 58/141/197 +f 47/76/194 48/144/198 58/141/197 +s 50 +f 59/84/199 53/20/200 45/83/201 +f 45/83/201 53/20/200 48/77/202 +f 48/77/202 53/20/200 58/78/203 +f 53/20/200 54/143/204 58/78/203 +s 51 +f 59/94/205 45/68/206 44/93/207 +f 44/93/207 45/68/206 43/92/208 +f 43/92/208 45/68/206 60/128/209 +f 45/68/206 46/129/210 60/128/209 +s 52 +f 57/99/211 50/100/212 47/98/213 +f 47/98/213 50/100/212 46/67/214 +f 46/67/214 50/100/212 60/97/215 +f 50/100/212 49/101/216 60/97/215 +s 53 +f 58/142/217 54/19/218 33/134/219 +f 33/134/219 54/19/218 36/87/220 +f 36/87/220 54/19/218 61/89/221 +f 54/19/218 55/88/222 61/89/221 +s 54 +f 62/126/223 56/24/224 41/103/225 +f 41/103/225 56/24/224 44/102/226 +f 44/102/226 56/24/224 59/107/227 +f 56/24/224 53/106/228 59/107/227 +s 55 +f 60/114/229 49/115/230 43/113/231 +f 43/113/231 49/115/230 42/43/232 +f 42/43/232 49/115/230 63/117/233 +f 49/115/230 51/125/234 63/117/233 +s 56 +f 64/131/235 52/81/236 35/130/237 +f 35/130/237 52/81/236 34/31/238 +f 34/31/238 52/81/236 57/75/239 +f 52/81/236 50/82/240 57/75/239 +s 57 +f 61/133/241 37/56/242 36/132/243 +f 36/132/243 37/56/242 35/79/244 +f 35/79/244 37/56/242 64/80/245 +f 37/56/242 38/91/246 64/80/245 +s 58 +f 61/110/247 55/111/248 37/109/249 +f 37/109/249 55/111/248 40/60/250 +f 40/60/250 55/111/248 62/104/251 +f 55/111/248 56/127/252 62/104/251 +s 59 +f 62/123/253 41/124/254 40/122/255 +f 40/122/255 41/124/254 39/59/256 +f 39/59/256 41/124/254 63/137/257 +f 41/124/254 42/140/258 63/137/257 +s 60 +f 63/138/259 51/116/260 39/139/261 +f 39/139/261 51/116/260 38/55/262 +f 38/55/262 51/116/260 64/121/263 +f 51/116/260 52/120/264 64/121/263 +s off +f 71/193/265 74/194/266 72/195/267 +f 77/196/268 76/197/269 69/198/270 +f 75/199/271 70/200/272 73/201/273 +s 61 +f 65/202/274 72/203/275 66/204/276 +f 72/203/275 74/205/277 66/204/276 +f 74/205/277 67/206/278 66/204/276 +s 62 +f 67/206/279 74/205/280 75/207/281 +f 74/205/280 71/208/282 75/207/281 +f 71/208/282 70/209/283 75/207/281 +s 63 +f 66/210/284 67/211/285 68/212/286 +f 67/211/285 75/213/287 68/212/286 +f 75/213/287 73/214/288 68/212/286 +s 64 +f 68/212/289 73/214/290 76/215/291 +f 73/214/290 70/216/292 76/215/291 +f 70/216/292 69/217/293 76/215/291 +s 65 +f 65/218/294 77/219/295 72/220/296 +f 77/219/295 69/221/297 72/220/296 +f 69/221/297 71/222/298 72/220/296 +s 66 +f 65/218/299 66/223/300 77/219/301 +f 77/219/301 66/223/300 76/224/302 +f 76/224/302 66/223/300 68/225/303 +s off +f 84/226/304 87/227/305 85/228/306 +f 90/229/307 89/230/308 82/231/309 +f 88/232/310 83/233/311 86/234/312 +s 67 +f 78/235/313 85/236/314 79/237/315 +f 85/236/314 87/238/316 79/237/315 +f 87/238/316 80/239/317 79/237/315 +s 68 +f 80/239/318 87/238/319 88/240/320 +f 87/238/319 84/241/321 88/240/320 +f 84/241/321 83/242/322 88/240/320 +s 69 +f 79/243/323 80/244/324 81/245/325 +f 80/244/324 88/246/326 81/245/325 +f 88/246/326 86/247/327 81/245/325 +s 70 +f 81/245/328 86/247/329 89/248/330 +f 86/247/329 83/249/331 89/248/330 +f 83/249/331 82/250/332 89/248/330 +s 71 +f 78/251/333 90/252/334 85/253/335 +f 90/252/334 82/254/336 85/253/335 +f 82/254/336 84/255/337 85/253/335 +s 72 +f 78/251/338 79/256/339 90/252/340 +f 90/252/340 79/256/339 89/257/341 +f 89/257/341 79/256/339 81/258/342 +s off +f 97/259/343 100/260/344 98/261/345 +f 103/262/346 102/263/347 95/264/348 +f 101/265/349 96/266/350 99/267/351 +s 73 +f 91/268/352 98/269/353 92/270/354 +f 98/269/353 100/271/355 92/270/354 +f 100/271/355 93/272/356 92/270/354 +s 74 +f 93/272/357 100/271/358 101/273/359 +f 100/271/358 97/274/360 101/273/359 +f 97/274/360 96/275/361 101/273/359 +s 75 +f 92/276/362 93/277/363 94/278/364 +f 93/277/363 101/279/365 94/278/364 +f 101/279/365 99/280/366 94/278/364 +s 76 +f 94/278/367 99/280/368 102/281/369 +f 99/280/368 96/282/370 102/281/369 +f 96/282/370 95/283/371 102/281/369 +s 77 +f 91/284/372 103/285/373 98/286/374 +f 103/285/373 95/287/375 98/286/374 +f 95/287/375 97/288/376 98/286/374 +s 78 +f 91/284/377 92/289/378 103/285/379 +f 103/285/379 92/289/378 102/290/380 +f 102/290/380 92/289/378 94/291/381 +s off +f 110/292/382 113/293/383 111/294/384 +f 116/295/385 115/296/386 108/297/387 +f 114/298/388 109/299/389 112/300/390 +s 79 +f 104/301/391 111/302/392 105/303/393 +f 111/302/392 113/304/394 105/303/393 +f 113/304/394 106/305/395 105/303/393 +s 80 +f 106/305/396 113/304/397 114/306/398 +f 113/304/397 110/307/399 114/306/398 +f 110/307/399 109/308/400 114/306/398 +s 81 +f 105/309/401 106/310/402 107/311/403 +f 106/310/402 114/312/404 107/311/403 +f 114/312/404 112/313/405 107/311/403 +s 82 +f 107/311/406 112/313/407 115/314/408 +f 112/313/407 109/315/409 115/314/408 +f 109/315/409 108/316/410 115/314/408 +s 83 +f 104/317/411 116/318/412 111/319/413 +f 116/318/412 108/320/414 111/319/413 +f 108/320/414 110/321/415 111/319/413 +s 84 +f 104/317/416 105/322/417 116/318/418 +f 116/318/418 105/322/417 115/323/419 +f 115/323/419 105/322/417 107/324/420 +s off +f 123/325/421 126/326/422 124/327/423 +f 129/328/424 128/329/425 121/330/426 +f 127/331/427 122/332/428 125/333/429 +s 85 +f 117/334/430 124/335/431 118/336/432 +f 124/335/431 126/337/433 118/336/432 +f 126/337/433 119/338/434 118/336/432 +s 86 +f 119/338/435 126/337/436 127/339/437 +f 126/337/436 123/340/438 127/339/437 +f 123/340/438 122/341/439 127/339/437 +s 87 +f 118/342/440 119/343/441 120/344/442 +f 119/343/441 127/345/443 120/344/442 +f 127/345/443 125/346/444 120/344/442 +s 88 +f 120/344/445 125/346/446 128/347/447 +f 125/346/446 122/348/448 128/347/447 +f 122/348/448 121/349/449 128/347/447 +s 89 +f 117/350/450 129/351/451 124/352/452 +f 129/351/451 121/353/453 124/352/452 +f 121/353/453 123/354/454 124/352/452 +s 90 +f 117/350/455 118/355/456 129/351/457 +f 129/351/457 118/355/456 128/356/458 +f 128/356/458 118/355/456 120/357/459 +s off +f 136/358/460 139/359/461 137/360/462 +f 142/361/463 141/362/464 134/363/465 +f 140/364/466 135/365/467 138/366/468 +s 91 +f 130/367/469 137/368/470 131/369/471 +f 137/368/470 139/370/472 131/369/471 +f 139/370/472 132/371/473 131/369/471 +s 92 +f 132/371/474 139/370/475 140/372/476 +f 139/370/475 136/373/477 140/372/476 +f 136/373/477 135/374/478 140/372/476 +s 93 +f 131/375/479 132/376/480 133/377/481 +f 132/376/480 140/378/482 133/377/481 +f 140/378/482 138/379/483 133/377/481 +s 94 +f 133/377/484 138/379/485 141/380/486 +f 138/379/485 135/381/487 141/380/486 +f 135/381/487 134/382/488 141/380/486 +s 95 +f 130/383/489 142/384/490 137/385/491 +f 142/384/490 134/386/492 137/385/491 +f 134/386/492 136/387/493 137/385/491 +s 96 +f 130/383/494 131/388/495 142/384/496 +f 142/384/496 131/388/495 141/389/497 +f 141/389/497 131/388/495 133/390/498 +s off +f 149/391/499 152/392/500 150/393/501 +f 155/394/502 154/395/503 147/396/504 +f 153/397/505 148/398/506 151/399/507 +s 97 +f 143/400/508 150/401/509 144/402/510 +f 150/401/509 152/403/511 144/402/510 +f 152/403/511 145/404/512 144/402/510 +s 98 +f 145/404/513 152/403/514 153/405/515 +f 152/403/514 149/406/516 153/405/515 +f 149/406/516 148/407/517 153/405/515 +s 99 +f 144/408/518 145/409/519 146/410/520 +f 145/409/519 153/411/521 146/410/520 +f 153/411/521 151/412/522 146/410/520 +s 100 +f 146/410/523 151/412/524 154/413/525 +f 151/412/524 148/414/526 154/413/525 +f 148/414/526 147/415/527 154/413/525 +s 101 +f 143/416/528 155/417/529 150/418/530 +f 155/417/529 147/419/531 150/418/530 +f 147/419/531 149/420/532 150/418/530 +s 102 +f 143/416/533 144/421/534 155/417/535 +f 155/417/535 144/421/534 154/422/536 +f 154/422/536 144/421/534 146/423/537 +s off +f 162/424/538 165/425/539 163/426/540 +f 168/427/541 167/428/542 160/429/543 +f 166/430/544 161/431/545 164/432/546 +s 103 +f 156/433/547 163/434/548 157/435/549 +f 163/434/548 165/436/550 157/435/549 +f 165/436/550 158/437/551 157/435/549 +s 104 +f 158/437/552 165/436/553 166/438/554 +f 165/436/553 162/439/555 166/438/554 +f 162/439/555 161/440/556 166/438/554 +s 105 +f 157/441/557 158/442/558 159/443/559 +f 158/442/558 166/444/560 159/443/559 +f 166/444/560 164/445/561 159/443/559 +s 106 +f 159/443/562 164/445/563 167/446/564 +f 164/445/563 161/447/565 167/446/564 +f 161/447/565 160/448/566 167/446/564 +s 107 +f 156/449/567 168/450/568 163/451/569 +f 168/450/568 160/452/570 163/451/569 +f 160/452/570 162/453/571 163/451/569 +s 108 +f 156/449/572 157/454/573 168/450/574 +f 168/450/574 157/454/573 167/455/575 +f 167/455/575 157/454/573 159/456/576 diff --git a/resources/assets/enderio/models/transceiver.png b/resources/assets/enderio/models/transceiver.png new file mode 100644 index 00000000..fff555d0 Binary files /dev/null and b/resources/assets/enderio/models/transceiver.png differ diff --git a/resources/assets/enderio/models/transceiverAlt.png b/resources/assets/enderio/models/transceiverAlt.png new file mode 100644 index 00000000..0ccb7b3f Binary files /dev/null and b/resources/assets/enderio/models/transceiverAlt.png differ diff --git a/resources/assets/enderio/textures/gui/transceiver.png b/resources/assets/enderio/textures/gui/transceiver.png new file mode 100644 index 00000000..1935fbe9 Binary files /dev/null and b/resources/assets/enderio/textures/gui/transceiver.png differ diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png index 9d82b7e8..92b0e0b4 100644 Binary files a/resources/assets/enderio/textures/gui/widgets.png and b/resources/assets/enderio/textures/gui/widgets.png differ diff --git a/src/main/java/crazypants/Crap.java b/src/main/java/crazypants/Crap.java new file mode 100644 index 00000000..b6e5d3de --- /dev/null +++ b/src/main/java/crazypants/Crap.java @@ -0,0 +1,19 @@ +package crazypants; + +import java.io.BufferedReader; +import java.io.FileReader; + +public class Crap { + + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader("C:\\MyData\\Dev\\Minecraft\\Workspace17\\PamsSeeds.txt")); + String line = br.readLine(); + System.out.println("private static final String[] PAMS_SEEDS = new String[] {"); + while(line != null) { + System.out.println("\"" + line.trim() + "\","); + line = br.readLine(); + } + System.out.println("};"); + } + +} diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 9dcfed28..7bf6f854 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -104,6 +104,8 @@ import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.machine.tank.TankFluidRenderer; import crazypants.enderio.machine.tank.TankItemRenderer; import crazypants.enderio.machine.tank.TileTank; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.enderio.machine.transceiver.render.TransceiverRenderer; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.vacuum.VacuumChestRenderer; import crazypants.enderio.machine.xp.BlockExperianceObelisk; @@ -344,6 +346,10 @@ public class ClientProxy extends CommonProxy { HyperCubeRenderer hcr = new HyperCubeRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); + + TransceiverRenderer tr = new TransceiverRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileTransceiver.class, tr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTransceiver), tr); new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); new ConduitProbeOverlayRenderer(); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 58c5b424..e85e6804 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -114,6 +114,8 @@ import crazypants.enderio.machine.spawnguard.RangeEntity; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; +import crazypants.enderio.machine.transceiver.BlockTransceiver; +import crazypants.enderio.machine.transceiver.ServerChannelRegister; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.wireless.BlockWirelessCharger; import crazypants.enderio.machine.xp.BlockExperianceObelisk; @@ -221,6 +223,7 @@ public class EnderIO { public static BlockAttractor blockAttractor; public static BlockSpawnGuard blockSpawnGuard; public static BlockExperianceObelisk blockExperianceOblisk; + public static BlockTransceiver blockTransceiver; public static BlockKillerJoe blockKillerJoe; @@ -314,6 +317,8 @@ public class EnderIO { blockTank = BlockTank.create(); blockReservoir = BlockReservoir.create(); blockVacuumChest = BlockVacuumChest.create(); + + blockTransceiver = BlockTransceiver.create(); blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); @@ -597,10 +602,12 @@ public class EnderIO { @EventHandler public void serverStarted(FMLServerStartedEvent event) { HyperCubeRegister.load(); + ServerChannelRegister.load(); } @EventHandler public void serverStopped(FMLServerStoppedEvent event) { HyperCubeRegister.unload(); + ServerChannelRegister.store(); } } diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 1b67e958..a9f70a06 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -47,6 +47,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_SLICE_N_SPLICE = 94; public static final int GUI_ID_ATTRACTOR = 95; public static final int GUI_ID_SPAWN_GUARD = 96; + public static final int GUI_ID_TRANSCEIVER = 97; protected final Map guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 21ae1e58..859c099c 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -56,6 +56,7 @@ public enum ModObject { blockAttractor, blockSpawnGuard, blockExperienceObelisk, + blockTransceiver, blockPoweredSpawner, itemBrokenSpawner, diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 891dc74d..bd571141 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -11,13 +11,14 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; +import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.Lang; -public class BaseSettingsPanel implements ISettingsPanel { +public class BaseSettingsPanel implements ITabPanel { static final int PREV_MODE_B = 327; static final int NEXT_MODE_B = 328; @@ -88,8 +89,15 @@ public class BaseSettingsPanel implements ISettingsPanel { public void deactivate() { } - public void mouseClicked(int x, int y, int par3) { - + public void mouseClicked(int x, int y, int par3) { + } + + @Override + public void keyTyped(char par1, int par2) { + } + + @Override + public void updateScreen() { } @Override diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index e6a6aab8..1f5c7e72 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -21,6 +21,7 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; @@ -49,7 +50,7 @@ public class GuiExternalConnection extends GuiContainerBase { private final ForgeDirection dir; private final List conduits = new ArrayList(); - private final List tabs = new ArrayList(); + private final List tabs = new ArrayList(); private int activeTab = 0; private int tabYOffset = 4; @@ -91,7 +92,7 @@ public class GuiExternalConnection extends GuiContainerBase { for (IConduit con : cons) { if(con.containsExternalConnection(dir) || con.canConnectToExternal(dir, true)) { - ISettingsPanel tab = TabFactory.instance.createPanelForConduit(this, con); + ITabPanel tab = TabFactory.instance.createPanelForConduit(this, con); if(tab != null) { conduits.add(con); tabs.add(tab); diff --git a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java index 34cfc2f5..2739de88 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java +++ b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java @@ -7,6 +7,7 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.gui.ITabPanel; public class TabFactory { @@ -15,7 +16,7 @@ public class TabFactory { private TabFactory() { } - public ISettingsPanel createPanelForConduit(GuiExternalConnection gui, IConduit con) { + public ITabPanel createPanelForConduit(GuiExternalConnection gui, IConduit con) { Class baseType = con.getBaseConduitType(); if(baseType.isAssignableFrom(IPowerConduit.class)) { return new PowerSettings(gui, con); diff --git a/src/main/java/crazypants/enderio/entity/EntityEnderminy.java b/src/main/java/crazypants/enderio/entity/EntityEnderminy.java index 8a40505c..3e3bf9f6 100644 --- a/src/main/java/crazypants/enderio/entity/EntityEnderminy.java +++ b/src/main/java/crazypants/enderio/entity/EntityEnderminy.java @@ -40,17 +40,7 @@ import net.minecraftforge.event.entity.living.EnderTeleportEvent; public class EntityEnderminy extends EntityMob { - private final class ClosestEntityComparator implements Comparator { - Vector3d pos = new Vector3d(posX, posY, posZ); - - @Override - public int compare(EntityCreeper o1, EntityCreeper o2) { - double d1 = new Vector3d(o1.posX, o1.posY, o1.posZ).distanceSquared(pos); - double d2 = new Vector3d(o2.posX, o2.posY, o2.posZ).distanceSquared(pos); - return Double.compare(d1, d2); - } - } - + public static String NAME = "Enderminy"; private static final int MAX_RND_TP_DISTANCE = 32; @@ -390,6 +380,10 @@ public class EntityEnderminy extends EntityMob { if(!groupAgroEnabled) { return; } + if(! (entityToAttack instanceof EntityPlayer)) { + return; + } + System.out.println("EntityEnderminy.doGroupArgo: "); int range = 16; AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range); List minies = worldObj.getEntitiesWithinAABB(EntityEnderminy.class, bb); @@ -410,5 +404,18 @@ public class EntityEnderminy extends EntityMob { public void setScreaming(boolean p_70819_1_) { dataWatcher.updateObject(18, Byte.valueOf((byte) (p_70819_1_ ? 1 : 0))); } + + private final class ClosestEntityComparator implements Comparator { + Vector3d pos = new Vector3d(); + + @Override + public int compare(EntityCreeper o1, EntityCreeper o2) { + pos.set(posX,posY,posZ); + double d1 = new Vector3d(o1.posX, o1.posY, o1.posZ).distanceSquared(pos); + double d2 = new Vector3d(o2.posX, o2.posY, o2.posZ).distanceSquared(pos); + return Double.compare(d1, d2); + } + } + } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java b/src/main/java/crazypants/enderio/gui/ITabPanel.java similarity index 68% rename from src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java rename to src/main/java/crazypants/enderio/gui/ITabPanel.java index 4b8707c6..6ae23e04 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ISettingsPanel.java +++ b/src/main/java/crazypants/enderio/gui/ITabPanel.java @@ -1,9 +1,8 @@ -package crazypants.enderio.conduit.gui; +package crazypants.enderio.gui; import net.minecraft.client.gui.GuiButton; -import crazypants.enderio.gui.IconEIO; -public interface ISettingsPanel { +public interface ITabPanel { void onGuiInit(int x, int y, int width, int height); @@ -16,5 +15,9 @@ public interface ISettingsPanel { void actionPerformed(GuiButton guiButton); void mouseClicked(int x, int y, int par3); + + void keyTyped(char par1, int par2); + + void updateScreen(); } diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 5fd0e769..8518ab40 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -14,6 +14,7 @@ public final class IconEIO { public static final IconEIO PRIVATE = new IconEIO(48, 100); public static final IconEIO CROSS = new IconEIO(64, 100); public static final IconEIO PLUS = new IconEIO(80, 100); + public static final IconEIO ARROWS = new IconEIO(178, 100); public static final IconEIO BUTTON = new IconEIO(0, 116); public static final IconEIO CHECKED_BUTTON = new IconEIO(0, 132); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java index 689ab54f..43adde45 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java @@ -1,6 +1,10 @@ package crazypants.enderio.machine; import java.awt.Point; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -11,6 +15,8 @@ import net.minecraft.item.ItemStack; public abstract class AbstractMachineContainer extends Container { protected final AbstractMachineEntity tileEntity; + + protected Map playerSlotLocations = new HashMap(); public AbstractMachineContainer(InventoryPlayer playerInv, AbstractMachineEntity te) { this.tileEntity = te; @@ -33,17 +39,26 @@ public abstract class AbstractMachineContainer extends Container { } int x = getPlayerInventoryOffset().x; - int y = getPlayerInventoryOffset().y; + int y = getPlayerInventoryOffset().y; + // add players inventory for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, x + j * 18, y + i * 18)); + Point loc = new Point(x + j * 18, y + i * 18); + Slot slot = new Slot(playerInv, j + i * 9 + 9, loc.x, loc.y); + addSlotToContainer(slot); + playerSlotLocations.put(slot, loc); } } - + for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(playerInv, i, x + i * 18, y + 58)); + Point loc = new Point(x + i * 18, y + 58); + Slot slot = new Slot(playerInv, i, loc.x, loc.y); + addSlotToContainer(slot); + playerSlotLocations.put(slot, loc); } + + } @Override @@ -51,11 +66,11 @@ public abstract class AbstractMachineContainer extends Container { return tileEntity.isUseableByPlayer(entityplayer); } - protected Point getPlayerInventoryOffset() { + public Point getPlayerInventoryOffset() { return new Point(8,84); } - protected Point getUpgradeOffset() { + public Point getUpgradeOffset() { return new Point(12,60); } diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index 1382bdde..c3749091 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -37,11 +37,11 @@ public abstract class GuiMachineBase extends GuiContainerBase { private AbstractMachineEntity tileEntity; - private RedstoneModeButton redstoneButton; + protected RedstoneModeButton redstoneButton; private GuiOverlayIoConfig configOverlay; - private IconButtonEIO configB; + protected IconButtonEIO configB; public GuiMachineBase(AbstractMachineEntity machine, Container container) { super(container); @@ -52,15 +52,18 @@ public abstract class GuiMachineBase extends GuiContainerBase { @Override protected void updateText() { text.clear(); - text.add(getPowerOutputText() + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr()); - //text.add() - text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); - + if(renderPowerBar()) { + text.add(getPowerOutputText() + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() + + PowerDisplayUtil.perTickStr()); + //text.add() + text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); + } } }); } + xSize = getXSize(); + ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); @@ -84,7 +87,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { protected boolean showRecipeButton() { return EnderIO.proxy.isNeiInstalled(); } - + protected String getPowerOutputText() { return "Max: "; } @@ -152,8 +155,8 @@ public abstract class GuiMachineBase extends GuiContainerBase { int k = (width - xSize) / 2; int l = (height - ySize) / 2; - if(renderPowerBar()) { - int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); + if(renderPowerBar()) { + int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); // x, y, u, v, width, height drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, getPowerU(), getPowerV(), getPowerWidth(), i1); } diff --git a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java index 6681b08b..8d8e537b 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java @@ -41,11 +41,11 @@ public class ContainerCrafter extends AbstractMachineContainer { } @Override - protected Point getPlayerInventoryOffset() { + public Point getPlayerInventoryOffset() { return new Point(30, 84); } - protected Point getUpgradeOffset() { + public Point getUpgradeOffset() { return new Point(6, 60); } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 834c8e99..31fe3357 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -132,6 +132,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); renderModel(ForgeDirection.SOUTH.ordinal()); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java new file mode 100644 index 00000000..0690bc94 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -0,0 +1,80 @@ +package crazypants.enderio.machine.transceiver; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.transceiver.gui.ContainerTransceiver; +import crazypants.enderio.machine.transceiver.gui.GuiTransceiver; +import crazypants.enderio.network.PacketHandler; + +public class BlockTransceiver extends AbstractMachineBlock { + + public static BlockTransceiver create() { + + PacketHandler.INSTANCE.registerMessage(PacketSendRecieveChannel.class, PacketSendRecieveChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); + + ConnectionHandler ch = new ConnectionHandler(); + FMLCommonHandler.instance().bus().register(ch); + MinecraftForge.EVENT_BUS.register(ch); + + BlockTransceiver res = new BlockTransceiver(); + res.init(); + return res; + } + + private BlockTransceiver() { + super(ModObject.blockTransceiver, TileTransceiver.class); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileTransceiver) { + return new ContainerTransceiver(player.inventory, (TileTransceiver) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + return new GuiTransceiver(player.inventory, (TileTransceiver) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_TRANSCEIVER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:alloySmelterFrontOn"; + } + return "enderio:alloySmelterFront"; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java new file mode 100644 index 00000000..3fade326 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java @@ -0,0 +1,104 @@ +package crazypants.enderio.machine.transceiver; + +import net.minecraft.nbt.NBTTagCompound; + + +public class Channel { + + public static Channel readFromNBT(NBTTagCompound root) { + if(!root.hasKey("name")) { + return null; + } + String name = root.getString("name"); + String user = null; + if(root.hasKey("user")) { + user = root.getString("user"); + } + ChannelType type = ChannelType.values()[root.getShort("type")]; + return new Channel(name, user, type); + } + + private final String name; + final String user; + final ChannelType type; + + public Channel(String name, String user, ChannelType type) { + this.name = trim(name); + this.user = user; + this.type = type; + } + + public boolean isPublic() { + return user == null; + } + + public void writeToNBT(NBTTagCompound root) { + if(name == null || name.isEmpty()) { + return; + } + root.setString("name", name); + root.setShort("type", (short)type.ordinal()); + if(user != null && user.length() > 0) { + root.setString("user", user); + } + } + + private String trim(String str) { + if(str == null) { + return null; + } + str = str.trim(); + if(str.isEmpty()) { + return null; + } + return str; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((user == null) ? 0 : user.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if(this == obj) + return true; + if(obj == null) + return false; + if(getClass() != obj.getClass()) + return false; + Channel other = (Channel) obj; + if(getName() == null) { + if(other.getName() != null) + return false; + } else if(!getName().equals(other.getName())) + return false; + if(type != other.type) + return false; + if(user == null) { + if(other.user != null) + return false; + } else if(!user.equals(other.user)) + return false; + return true; + } + + public String getName() { + return name; + } + + public ChannelType getType() { + return type; + } + + public String getUser() { + return user; + } + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java new file mode 100644 index 00000000..f1b0f209 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java @@ -0,0 +1,39 @@ +package crazypants.enderio.machine.transceiver; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; + +public class ChannelRegister { + + protected EnumMap> channels = new EnumMap>(ChannelType.class); + + public List getChannelsForType(ChannelType type) { + return channels.get(type); + } + + public void addChannel(Channel channel) { + if(channel == null) { + return; + } + List chans = getChannelsForType(channel.getType()); + if(!chans.contains(channel)) { + chans.add(channel); + } + } + + public void removeChannel(Channel channel) { + if(channel == null) { + return; + } + getChannelsForType(channel.getType()).remove(channel); + } + + public void reset() { + channels.clear(); + for (ChannelType type : ChannelType.values()) { + channels.put(type, new ArrayList()); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java new file mode 100644 index 00000000..012a937e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java @@ -0,0 +1,9 @@ +package crazypants.enderio.machine.transceiver; + +public enum ChannelType { + + POWER, + ITEM, + FLUID + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java new file mode 100644 index 00000000..b459e3e0 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java @@ -0,0 +1,27 @@ +package crazypants.enderio.machine.transceiver; + +import crazypants.enderio.EnderIO; + + +public class ClientChannelRegister extends ChannelRegister { + + public static final ChannelRegister instance = new ClientChannelRegister(); + + private ClientChannelRegister() { + reset(); + } + + @Override + public void addChannel(Channel channel) { + if(channel == null) { + return; + } + if(channel.getUser() != null && !channel.getUser().equals(EnderIO.proxy.getClientPlayer().getGameProfile().getName())) { + return; + } + super.addChannel(channel); + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java new file mode 100644 index 00000000..ca5a8512 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java @@ -0,0 +1,24 @@ +package crazypants.enderio.machine.transceiver; + +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; +import crazypants.enderio.network.PacketHandler; + +public class ConnectionHandler { + + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + PacketHandler.INSTANCE.sendTo(new PacketChannelList(ServerChannelRegister.instance), (EntityPlayerMP) evt.player); + } + + @SubscribeEvent + public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { + ClientChannelRegister.instance.reset(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java new file mode 100644 index 00000000..8a570f39 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java @@ -0,0 +1,57 @@ +package crazypants.enderio.machine.transceiver; + +import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.machine.hypercube.PacketChannelList; +import crazypants.enderio.network.NetworkUtil; +import crazypants.enderio.network.PacketHandler; + +public class PacketAddRemoveChannel implements IMessage, IMessageHandler { + + private boolean isAdd; + private Channel channel; + + public PacketAddRemoveChannel() { + } + + public PacketAddRemoveChannel(Channel channel, boolean isAdd) { + this.channel = channel; + this.isAdd = isAdd; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(isAdd); + NBTTagCompound nbt = new NBTTagCompound(); + channel.writeToNBT(nbt); + NetworkUtil.writeNBTTagCompound(nbt, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + isAdd = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + channel = Channel.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketAddRemoveChannel message, MessageContext ctx) { + ChannelRegister register = ctx.side == Side.CLIENT ? ClientChannelRegister.instance : ServerChannelRegister.instance; + if(message.isAdd) { + register.addChannel(message.channel); + } else { + register.removeChannel(message.channel); + } + if(ctx.side == Side.SERVER) { + PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(message.channel, message.isAdd)); + } + return null; + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java new file mode 100644 index 00000000..0bb09568 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -0,0 +1,67 @@ +package crazypants.enderio.machine.transceiver; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.NetworkUtil; + +public class PacketChannelList implements IMessage, IMessageHandler { + + private List channels; + + public PacketChannelList() { + } + + public PacketChannelList(ChannelRegister register) { + channels = new ArrayList(); + for (ChannelType type : ChannelType.values()) { + for (Channel channel : register.getChannelsForType(type)) { + channels.add(channel); + } + } + } + + @Override + public void toBytes(ByteBuf buf) { + NBTTagList tagList = new NBTTagList(); + for(Channel chan : channels) { + NBTTagCompound tag = new NBTTagCompound(); + chan.writeToNBT(tag); + tagList.appendTag(tag); + } + NBTTagCompound root = new NBTTagCompound(); + root.setTag("chanList", tagList); + NetworkUtil.writeNBTTagCompound(root, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + NBTTagCompound root = NetworkUtil.readNBTTagCompound(buf); + NBTTagList tagList = (NBTTagList)root.getTag("chanList"); + channels = new ArrayList(); + for(int i=0; i < tagList.tagCount();i++) { + NBTTagCompound tag = tagList.getCompoundTagAt(i); + Channel chan = Channel.readFromNBT(tag); + if(chan != null) { + channels.add(chan); + } + } + + } + + @Override + public IMessage onMessage(PacketChannelList message, MessageContext ctx) { + for(Channel channel : message.channels) { + ClientChannelRegister.instance.addChannel(channel); + } + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java new file mode 100644 index 00000000..26eec900 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java @@ -0,0 +1,78 @@ +package crazypants.enderio.machine.transceiver; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.PacketCurrentTask; +import crazypants.enderio.machine.PoweredTask; +import crazypants.enderio.network.MessageTileEntity; +import crazypants.enderio.network.NetworkUtil; + +public class PacketSendRecieveChannel extends MessageTileEntity implements IMessageHandler { + + private boolean isSend; + private boolean isAdd; + private Channel channel; + + public PacketSendRecieveChannel() { + } + + public PacketSendRecieveChannel(TileTransceiver te, boolean isSend, boolean isAdd, Channel channel) { + super(te); + this.isSend = isSend; + this.isAdd = isAdd; + this.channel = channel; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(isSend); + buf.writeBoolean(isAdd); + NBTTagCompound tag = new NBTTagCompound(); + channel.writeToNBT(tag); + NetworkUtil.writeNBTTagCompound(tag, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + isSend = buf.readBoolean(); + isAdd = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + channel = Channel.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketSendRecieveChannel message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileTransceiver tile = message.getTileEntity(player.worldObj); + Channel channel = message.channel; + boolean isSend = message.isSend; + boolean isAdd = message.isAdd; + if (tile != null && channel != null) { + if(isSend) { + if(isAdd) { + tile.addSendChanel(channel); + } else { + tile.removeSendChanel(channel); + } + } else { + if(isAdd) { + tile.addRecieveChanel(channel); + } else { + tile.removeRecieveChanel(channel); + } + } + } + return null; + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java new file mode 100644 index 00000000..c67922bb --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -0,0 +1,82 @@ +package crazypants.enderio.machine.transceiver; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.util.List; + +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +import crazypants.enderio.Log; + +import net.minecraftforge.common.DimensionManager; + +public class ServerChannelRegister extends ChannelRegister { + + public static ServerChannelRegister instance = new ServerChannelRegister(); + + public static void load() { + instance.reset(); + File dataFile = getDataFile(); + if(!dataFile.exists()) { + return; + } + + try { + JsonReader reader = new JsonReader(new FileReader(getDataFile())); + reader.beginArray(); + while (reader.hasNext()) { + reader.beginObject(); + reader.nextName(); + String name = reader.nextString(); + String key = reader.nextName(); + String user = null; + if("user".equals(key)) { + user = reader.nextString(); + reader.nextName(); + } + int oridinal = reader.nextInt(); + + Channel chan = new Channel(name, user, ChannelType.values()[oridinal]); + instance.addChannel(chan); + + reader.endObject(); + } + reader.endArray(); + reader.close(); + } catch (Exception e) { + Log.error("Could not read Dimensional trasciever channels from " + getDataFile().getAbsolutePath() + " : " + e); + } + } + + public static void store() { + try { + File dataFile = getDataFile(); + dataFile.getParentFile().mkdirs(); + JsonWriter writer = new JsonWriter(new FileWriter(dataFile, false)); + writer.setIndent(" "); + writer.beginArray(); + for (List chanList : instance.channels.values()) { + for (Channel chan : chanList) { + writer.beginObject(); + writer.name("name").value(chan.getName()); + if(chan.getUser() != null) { + writer.name("user").value(chan.getUser()); + } + writer.name("type").value(chan.getType().ordinal()); + writer.endObject(); + } + } + writer.endArray(); + writer.close(); + } catch (Exception e) { + Log.error("Could not write Dimensional trasciever channels to " + getDataFile().getAbsolutePath() + " : " + e); + } + } + + private static File getDataFile() { + return new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.json"); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java new file mode 100644 index 00000000..0fa6bf36 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -0,0 +1,139 @@ +package crazypants.enderio.machine.transceiver; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.SlotDefinition; + +public class TileTransceiver extends AbstractPoweredTaskEntity { + + private final EnumMap> sendChannels = new EnumMap>(ChannelType.class); + private final EnumMap> recieveChannels = new EnumMap>(ChannelType.class); + + private boolean channelsDirty = false; + + public TileTransceiver() { + super(new SlotDefinition(0, 0, 0)); + for (ChannelType type : ChannelType.values()) { + sendChannels.put(type, new ArrayList()); + recieveChannels.put(type, new ArrayList()); + } + } + + @Override + public String getMachineName() { + return ModObject.blockTransceiver.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return true; + } + + public List getSendChannels(ChannelType type) { + return sendChannels.get(type); + } + + public List getRecieveChannels(ChannelType type) { + return recieveChannels.get(type); + } + + public void addSendChanel(Channel channel) { + addChannel(channel, sendChannels); + } + + public void addRecieveChanel(Channel channel) { + addChannel(channel, recieveChannels); + } + + public void removeSendChanel(Channel channel) { + removeChannel(channel, sendChannels); + } + + public void removeRecieveChanel(Channel channel) { + removeChannel(channel, recieveChannels); + } + + private void addChannel(Channel channel, EnumMap> channels) { + if(channel == null) { + return; + } + List chans = channels.get(channel.getType()); + if(!chans.contains(channel)) { + chans.add(channel); + channelsDirty = true; + } + + } + + private void removeChannel(Channel channel, EnumMap> channels) { + if(channel == null) { + return; + } + List chans = channels.get(channel.getType()); + chans.remove(channel); + channelsDirty = true; + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + + readChannels(nbtRoot, sendChannels, "sendChannels"); + readChannels(nbtRoot, recieveChannels, "recieveChannels"); + + } + + private void readChannels(NBTTagCompound nbtRoot, EnumMap> readInto, String key) { + readInto.clear(); + for (ChannelType type : ChannelType.values()) { + readInto.put(type, new ArrayList()); + } + + if(!nbtRoot.hasKey(key)) { + return; + } + NBTTagList tags = (NBTTagList)nbtRoot.getTag(key); + for(int i=0;i> chans) { + NBTTagList res = new NBTTagList(); + for(List chanList : chans.values()) { + for(Channel channel : chanList) { + NBTTagCompound chanTag = new NBTTagCompound(); + channel.writeToNBT(chanTag); + res.appendTag(chanTag); + } + } + return res; + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/AbstractChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/AbstractChannelTab.java new file mode 100644 index 00000000..c4dad6b1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/AbstractChannelTab.java @@ -0,0 +1,262 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Color; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import crazypants.enderio.gui.ITabPanel; +import crazypants.enderio.gui.IconButtonEIO; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.machine.transceiver.Channel; +import crazypants.enderio.machine.transceiver.ChannelType; +import crazypants.enderio.machine.transceiver.ClientChannelRegister; +import crazypants.enderio.machine.transceiver.PacketAddRemoveChannel; +import crazypants.enderio.machine.transceiver.PacketSendRecieveChannel; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.enderio.network.PacketHandler; +import crazypants.gui.GuiScrollableList; +import crazypants.gui.ListSelectionListener; +import crazypants.render.ColorUtil; +import crazypants.util.Lang; + +public class AbstractChannelTab implements ITabPanel { + + protected static final int ADD_BUTTON_ID = 3; + protected static final int PRIVATE_BUTTON_ID = 4; + private static final int DELETE_CHANNEL_BUTTON_ID = 5; + + private static final int SEND_BUTTON_ID = 6; + private static final int RECIEVE_BUTTON_ID = 7; + + ChannelType type; + GuiTransceiver parent; + + IconButtonEIO addButton; + ToggleButtonEIO privateButton; + + GuiTextField newChannelTF; + GuiChannelList channelList; + + GuiChannelList sendChannels; + GuiChannelList recieveChannels; + + IconButtonEIO deleteChannelB; + IconButtonEIO sendB; + IconButtonEIO recieveB; + + ListSelectionListener selectionListener; + TileTransceiver transceiver; + + public AbstractChannelTab(GuiTransceiver guiTransceiver, ChannelType type) { + parent = guiTransceiver; + this.type = type; + transceiver = guiTransceiver.transceiver; + + newChannelTF = new GuiTextField(parent.getFontRenderer(), 7, 12, 103, 16); + addButton = new IconButtonEIO(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); + addButton.setToolTip(Lang.localize("gui.trans.addChannel")); + addButton.enabled = false; + + privateButton = new ToggleButtonEIO(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.PUBLIC, IconEIO.PRIVATE); + privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); + privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); + + int w = 104; + int h = 90; + int x = 7; + int y = 48; + channelList = new GuiChannelList(parent, w, h, x, y); + channelList.setChannels(ClientChannelRegister.instance.getChannelsForType(type)); + channelList.setShowSelectionBox(true); + channelList.setScrollButtonIds(100, 101); + + deleteChannelB = new IconButtonEIO(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); + deleteChannelB.setToolTip(Lang.localize("gui.trans.deleteChannel")); + + + x += w + 32; + h = 35; + sendChannels = new GuiChannelList(parent, w, h, x, y); + sendChannels.setChannels(transceiver.getSendChannels(type)); + sendChannels.setShowSelectionBox(true); + sendChannels.setScrollButtonIds(200, 201); + + sendB = new IconButtonEIO(parent,SEND_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); + + y += h + 20; + recieveChannels = new GuiChannelList(parent, w, h, x, y); + recieveChannels.setChannels(transceiver.getRecieveChannels(type)); + recieveChannels.setShowSelectionBox(true); + recieveChannels.setScrollButtonIds(300, 301); + + recieveB = new IconButtonEIO(parent,RECIEVE_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); + + + selectionListener = new ListSelectionListener() { + + @Override + public void selectionChanged(GuiScrollableList list, int selectedIndex) { + if(selectedIndex < 0) { + return; + } + if(list != channelList) { + channelList.setSelection(-1); + } + if(list != sendChannels) { + sendChannels.setSelection(-1); + } + if(list != recieveChannels) { + recieveChannels.setSelection(-1); + } + } + }; + channelList.addSelectionListener(selectionListener); + sendChannels.addSelectionListener(selectionListener); + recieveChannels.addSelectionListener(selectionListener); + + } + + @Override + public void onGuiInit(int x, int y, int width, int height) { + addButton.onGuiInit(); + privateButton.onGuiInit(); + deleteChannelB.onGuiInit(); + sendB.onGuiInit(); + recieveB.onGuiInit(); + + y = parent.getGuiTop() + 12; + x = parent.getGuiLeft() + 8; + newChannelTF.xPosition = x; + newChannelTF.yPosition = y; + newChannelTF.setCanLoseFocus(false); + newChannelTF.setMaxStringLength(32); + newChannelTF.setFocused(true); + + channelList.onGuiInit(parent); + sendChannels.onGuiInit(parent); + recieveChannels.onGuiInit(parent); + } + + @Override + public void deactivate() { + addButton.detach(); + privateButton.detach(); + deleteChannelB.detach(); + sendB.detach(); + recieveB.detach(); + } + + @Override + public void keyTyped(char par1, int par2) { + newChannelTF.textboxKeyTyped(par1, par2); + addButton.enabled = newChannelTF.getText().trim().length() > 0; + } + + @Override + public IconEIO getIcon() { + switch (type) { + case FLUID: + return IconEIO.WRENCH_OVERLAY_FLUID; + case ITEM: + return IconEIO.WRENCH_OVERLAY_ITEM; + case POWER: + default: + return IconEIO.WRENCH_OVERLAY_POWER; + } + } + + @Override + public void updateScreen() { + newChannelTF.updateCursorCounter(); + } + + @Override + public void render(float partialTick, int mouseX, int mouseY) { + newChannelTF.drawTextBox(); + channelList.drawScreen(mouseX, mouseY, partialTick); + sendChannels.drawScreen(mouseX, mouseY, partialTick); + recieveChannels.drawScreen(mouseX, mouseY, partialTick); + + int left = parent.getGuiLeft(); + int top = parent.getGuiTop(); + int x = left + 59; + int y = top + 36; + parent.drawCenteredString(parent.getFontRenderer(), "Available", x, y, ColorUtil.getRGB(Color.white)); + + x = left + 199; + parent.drawCenteredString(parent.getFontRenderer(), "Send", x, y, ColorUtil.getRGB(Color.white)); + + y += 56; + parent.drawCenteredString(parent.getFontRenderer(), "Recieve", x, y, ColorUtil.getRGB(Color.white)); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if(guiButton.id == ADD_BUTTON_ID) { + addChannelPressed(); + } else if(guiButton.id == DELETE_CHANNEL_BUTTON_ID) { + deleteChannelPressed(); + } else if(guiButton.id == SEND_BUTTON_ID) { + sendTogglePressed(); + } else if(guiButton.id == RECIEVE_BUTTON_ID) { + receiveTogglePressed(); + } + } + + private void receiveTogglePressed() { + Channel c = channelList.getSelectedElement(); + if(c != null && !transceiver.getRecieveChannels(type).contains(c)) { + transceiver.addRecieveChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, true, c)); + } else { + c = recieveChannels.getSelectedElement(); + if(c != null) { + transceiver.removeRecieveChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, false, c)); + } + } + } + + private void sendTogglePressed() { + Channel c = channelList.getSelectedElement(); + if(c != null && !transceiver.getSendChannels(type).contains(c)) { + transceiver.addSendChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, true, c)); + } else { + c = sendChannels.getSelectedElement(); + if(c != null) { + transceiver.removeSendChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, false, c)); + } + } + } + + private void deleteChannelPressed() { + Channel c = channelList.getSelectedElement(); + if(c != null) { + ClientChannelRegister.instance.removeChannel(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, false)); + } + } + + private void addChannelPressed() { + Channel c; + if(privateButton.isSelected()) { + c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile().getName(), type); + } else { + c = new Channel(newChannelTF.getText(), null, type); + } + ClientChannelRegister.instance.addChannel(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, true)); + channelList.setSelection(c); + newChannelTF.setText(""); + } + + @Override + public void mouseClicked(int x, int y, int par3) { + newChannelTF.mouseClicked(x, y, par3); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java new file mode 100644 index 00000000..7e164c80 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java @@ -0,0 +1,40 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Point; +import java.util.Map.Entry; +import java.util.Set; + +import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; + +public class ContainerTransceiver extends AbstractMachineContainer { + + private static final Point INV_OFFSET = new Point(47, 84); + + public ContainerTransceiver(InventoryPlayer inventory, TileTransceiver te) { + super(inventory, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + } + + public void setPlayerInventoryVisible(boolean visible) { + Set> entries = playerSlotLocations.entrySet(); + for(Entry entry : entries) { + entry.getKey().xDisplayPosition = visible ? entry.getValue().x : -3000; + entry.getKey().yDisplayPosition = visible ? entry.getValue().y : -3000; + } + } + + @Override + public Point getPlayerInventoryOffset() { + //return INV_OFFSET; + return new Point(47, 84); + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java new file mode 100644 index 00000000..13f29dea --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -0,0 +1,59 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Point; + +import net.minecraft.client.gui.GuiButton; +import crazypants.enderio.gui.ITabPanel; +import crazypants.enderio.gui.IconEIO; +import crazypants.render.RenderUtil; + +public class GeneralTab implements ITabPanel { + + ContainerTransceiver container; + GuiTransceiver parent; + + public GeneralTab(GuiTransceiver guiTransceiver) { + parent = guiTransceiver; + container = parent.container; + } + + @Override + public void onGuiInit(int x, int y, int width, int height) { + container.setPlayerInventoryVisible(true); + } + + @Override + public void deactivate() { + container.setPlayerInventoryVisible(false); + } + + @Override + public IconEIO getIcon() { + return IconEIO.IO_CONFIG_UP; + } + + @Override + public void render(float par1, int par2, int par3) { + RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); + Point invRoot = container.getPlayerInventoryOffset(); + parent.drawTexturedModalRect(parent.getGuiLeft() + invRoot.x - 1, parent.getGuiTop() + invRoot.y - 1, 24, 180, 162, 76); + + } + + @Override + public void actionPerformed(GuiButton guiButton) { + } + + @Override + public void mouseClicked(int x, int y, int par3) { + } + + @Override + public void updateScreen() { + } + + @Override + public void keyTyped(char par1, int par2) { + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java new file mode 100644 index 00000000..a0a7c42d --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java @@ -0,0 +1,82 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Color; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraftforge.event.terraingen.BiomeEvent.GetWaterColor; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.hypercube.GuiHyperCube; +import crazypants.enderio.machine.transceiver.Channel; +import crazypants.gui.GuiScrollableList; +import crazypants.render.ColorUtil; + +public class GuiChannelList extends GuiScrollableList { + + private List channels = new ArrayList(); + +// private Channel activeChannel; + + private final GuiTransceiver parent; + + public GuiChannelList(GuiTransceiver parent, int width, int height, int originX, int originY) { + super(width, height, originX, originY, Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 4); + this.parent = parent; + } + + void setChannels(List val) { + if(val == null) { + channels = Collections.emptyList(); + } + channels = val; + } + +// void setActiveChannel(Channel channel) { +// activeChannel = channel; +// } + + @Override + public int getNumElements() { + return channels.size(); + } + + @Override + public Channel getElementAt(int index) { + if(index < 0 || index >= channels.size()) { + return null; + } + return channels.get(index); + } + + @Override + protected boolean elementClicked(int i, boolean flag) { + if(getElementAt(i) == null) { + return false; + } else { + return true; + } + } + + @Override + protected void drawElement(int index, int xPosition, int yPosition, int rowHeight, Tessellator tessellator) { + if(index < 0 || index >= channels.size()) { + return; + } + Channel c = getElementAt(index); + if(c == null) { + return; + } + int col = ColorUtil.getRGB(Color.white); +// if(c.equals(activeChannel)) { +// col = ColorUtil.getRGB(Color.cyan); +// } + parent.drawString(parent.getFontRenderer(), c.getName(), xPosition + margin, yPosition + margin / 2, col); + if(!c.isPublic()) { + IconEIO.PRIVATE.renderIcon(xPosition + width - 18, yPosition - 3, 16, 15, 0, true); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java new file mode 100644 index 00000000..8e751fad --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -0,0 +1,208 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.gui.IGuiOverlay; +import crazypants.enderio.gui.ITabPanel; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; +import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.machine.transceiver.ChannelType; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; +import crazypants.util.Lang; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.InventoryPlayer; + +public class GuiTransceiver extends GuiMachineBase { + + private static final int TAB_HEIGHT = 24; + + private TileTransceiver entity; + + private int activeTab = 0; + private final List tabs = new ArrayList(); + private int tabYOffset = 4; + + ContainerTransceiver container; + TileTransceiver transceiver; + + public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { + super(te, new ContainerTransceiver(par1InventoryPlayer, te)); + this.entity = te; + container = (ContainerTransceiver)inventorySlots; + transceiver = te; + + tabs.add(new GeneralTab(this)); + tabs.add(new AbstractChannelTab(this, ChannelType.POWER)); + tabs.add(new AbstractChannelTab(this, ChannelType.ITEM)); + tabs.add(new AbstractChannelTab(this, ChannelType.FLUID)); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + public int getXSize() { + return 256; + } + + @Override + public void updateScreen() { + for (int i = 0; i < tabs.size(); i++) { + if(i == activeTab) { + tabs.get(i).updateScreen(); + return; + } + } + } + + @Override + protected void keyTyped(char par1, int par2) { + if(par2 == 1) { + for (IGuiOverlay overlay : overlays) { + if(overlay.isVisible()) { + overlay.setVisible(false); + return; + } + } + this.mc.thePlayer.closeScreen(); + } + + for (int i = 0; i < tabs.size(); i++) { + if(i == activeTab) { + tabs.get(i).keyTyped(par1, par2); + return; + } + } + } + + @Override + public void initGui() { + super.initGui(); + for (int i = 0; i < tabs.size(); i++) { + if(i == activeTab) { + tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); + } else { + tabs.get(i).deactivate(); + } + } + configB.visible = activeTab == 0; + redstoneButton.visible = activeTab == 0; + } + + @Override + protected boolean renderPowerBar() { + return activeTab == 0; + } + + @Override + protected int getPowerX() { + return super.getPowerX() - 4; + } + + @Override + protected int getPowerHeight() { + return 58; + } + + @Override + protected int getPowerY() { + return super.getPowerY(); + } + + @Override + protected int getPowerV() { + return 196; + } + + @Override + protected int getPowerU() { + return 246; + } + + @Override + protected void mouseClicked(int x, int y, int par3) { + super.mouseClicked(x, y, par3); + + int tabLeftX = xSize; + int tabRightX = tabLeftX + 22; + + int minY = tabYOffset; + int maxY = minY + (tabs.size() * TAB_HEIGHT); + + x = (x - guiLeft); + y = (y - guiTop); + + if(x > tabLeftX && x < tabRightX + 24) { + if(y > minY && y < maxY) { + activeTab = (y - minY) / 24; + initGui(); + return; + } + } + tabs.get(activeTab).mouseClicked(x, y, par3); + } + + + @Override + protected void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + tabs.get(activeTab).actionPerformed(guiButton); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + for (int i = 0; i < tabs.size(); i++) { + if(i != activeTab) { + RenderUtil.bindTexture(IconEIO.TEXTURE); + IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); + IconEIO icon = tabs.get(i).getIcon(); + icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 7, 10, 10, 0, false); + } + } + + tes.draw(); + + RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + if(renderPowerBar()) { + drawTexturedModalRect(getGuiLeft() + getPowerX() - 1, getGuiTop() + getPowerY() - 1, 233, 196, 12, getPowerHeight() + 2); + } + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + RenderUtil.bindTexture(IconEIO.TEXTURE); + tes.startDrawingQuads(); + IconEIO.ACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); + + if(tabs.size() > 0) { + IconEIO icon = tabs.get(activeTab).getIcon(); + icon.renderIcon(tabX + 4, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 7, 10, 10, 0, false); + tes.draw(); + tabs.get(activeTab).render(par1, par2, par3); + } else { + tes.draw(); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java new file mode 100644 index 00000000..7b427000 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java @@ -0,0 +1,11 @@ +package crazypants.enderio.machine.transceiver.render; + +import crazypants.enderio.machine.transceiver.TileTransceiver; + +public interface IModel { + + void render(TileTransceiver cube, double x, double y, double z); + + void render(); + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java new file mode 100644 index 00000000..6fa13786 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java @@ -0,0 +1,42 @@ +package crazypants.enderio.machine.transceiver.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.render.RenderUtil; + +public class TransceiverModel extends ModelBase implements IModel { + + public static final float SCALE = 1 / 16f; + + private static final String TEXTURE = "enderio:models/transceiver.png"; + private static final String MODEL = "enderio:models/transceiver.obj"; + + private IModelCustom model; + + public TransceiverModel() { + model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); + } + + @Override + public void render() { + GL11.glPushMatrix(); + GL11.glScalef(SCALE, SCALE, SCALE); + RenderUtil.bindTexture(TEXTURE); + model.renderAll(); + GL11.glPopMatrix(); + } + + @Override + public void render(TileTransceiver cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); + render(); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java new file mode 100644 index 00000000..a3adfdad --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java @@ -0,0 +1,251 @@ +package crazypants.enderio.machine.transceiver.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.render.RenderUtil; + +public class TransceiverModelAlt extends ModelBase implements IModel { + + private static final String TEXTURE = "enderio:models/transceiverAlt.png"; + + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; + ModelRenderer Shape17; + ModelRenderer Shape18; + ModelRenderer Shape19; + ModelRenderer Shape20; + ModelRenderer Shape21; + ModelRenderer Shape22; + ModelRenderer Shape23; + ModelRenderer Shape24; + ModelRenderer Shape25; + + public TransceiverModelAlt() { + textureWidth = 32; + textureHeight = 32; + + Shape1 = new ModelRenderer(this, 0, 7); + Shape1.addBox(0F, 0F, 0F, 6, 1, 6); + Shape1.setRotationPoint(-3F, 24F, -8F); + Shape1.setTextureSize(32, 32); + Shape1.mirror = true; + setRotation(Shape1, 1.570796F, 0F, 0F); + Shape2 = new ModelRenderer(this, 0, 0); + Shape2.addBox(0F, 0F, 0F, 6, 1, 5); + Shape2.setRotationPoint(7F, 23F, 3F); + Shape2.setTextureSize(32, 32); + Shape2.mirror = true; + setRotation(Shape2, 1.570796F, 1.570796F, 0F); + Shape3 = new ModelRenderer(this, 0, 0); + Shape3.addBox(0F, 0F, 0F, 6, 1, 5); + Shape3.setRotationPoint(-3F, 23F, 7F); + Shape3.setTextureSize(32, 32); + Shape3.mirror = true; + setRotation(Shape3, 1.570796F, 0F, 0F); + Shape4 = new ModelRenderer(this, 0, 7); + Shape4.addBox(0F, 0F, 0F, 6, 1, 6); + Shape4.setRotationPoint(-8F, 24F, 3F); + Shape4.setTextureSize(32, 32); + Shape4.mirror = true; + setRotation(Shape4, 1.570796F, 1.570796F, 0F); + Shape5 = new ModelRenderer(this, 0, 0); + Shape5.addBox(0F, 0F, 0F, 6, 1, 5); + Shape5.setRotationPoint(-3F, 14F, -8F); + Shape5.setTextureSize(32, 32); + Shape5.mirror = true; + setRotation(Shape5, 1.570796F, 0F, 0F); + Shape6 = new ModelRenderer(this, 0, 7); + Shape6.addBox(0F, 0F, 0F, 6, 1, 6); + Shape6.setRotationPoint(-7F, 13F, 8F); + Shape6.setTextureSize(32, 32); + Shape6.mirror = true; + //setRotation(Shape6, 1.570796F, 1.570796F, 1.570796F); + setRotation(Shape6, 0F, 1.570796F, 1.570796F); + Shape7 = new ModelRenderer(this, 0, 7); + Shape7.addBox(0F, 0F, 0F, 6, 1, 6); + Shape7.setRotationPoint(-8F, 13F, -8F); + Shape7.setTextureSize(32, 32); + Shape7.mirror = true; + setRotation(Shape7, 1.570796F, 0F, 1.570796F); + Shape8 = new ModelRenderer(this, 0, 0); + Shape8.addBox(0F, 0F, 0F, 6, 1, 5); + Shape8.setRotationPoint(-8F, 14F, 3F); + Shape8.setTextureSize(32, 32); + Shape8.mirror = true; + setRotation(Shape8, 1.570796F, 1.570796F, 0F); + Shape9 = new ModelRenderer(this, 0, 7); + Shape9.addBox(0F, 0F, 0F, 6, 1, 6); + Shape9.setRotationPoint(-3F, 23F, 2F); + Shape9.setTextureSize(32, 32); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + Shape10 = new ModelRenderer(this, 0, 7); + Shape10.addBox(0F, 0F, 0F, 6, 1, 6); + Shape10.setRotationPoint(2F, 23F, 3F); + Shape10.setTextureSize(32, 32); + Shape10.mirror = true; + setRotation(Shape10, 0F, 1.570796F, 0F); + Shape11 = new ModelRenderer(this, 0, 7); + Shape11.addBox(0F, 0F, 0F, 6, 1, 6); + Shape11.setRotationPoint(-3F, 23F, -8F); + Shape11.setTextureSize(32, 32); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); + Shape12 = new ModelRenderer(this, 0, 7); + Shape12.addBox(0F, 0F, 0F, 6, 1, 6); + Shape12.setRotationPoint(-8F, 23F, 3F); + Shape12.setTextureSize(32, 32); + Shape12.mirror = true; + setRotation(Shape12, 0F, 1.570796F, 0F); + Shape13 = new ModelRenderer(this, 0, 7); + Shape13.addBox(0F, 0F, 0F, 6, 1, 6); + Shape13.setRotationPoint(-8F, 8F, 3F); + Shape13.setTextureSize(32, 32); + Shape13.mirror = true; + setRotation(Shape13, 0F, 1.570796F, 0F); + Shape14 = new ModelRenderer(this, 0, 7); + Shape14.addBox(0F, 0F, 0F, 6, 1, 6); + Shape14.setRotationPoint(-3F, 8F, 2F); + Shape14.setTextureSize(32, 32); + Shape14.mirror = true; + setRotation(Shape14, 0F, 0F, 0F); + Shape15 = new ModelRenderer(this, 0, 7); + Shape15.addBox(0F, 0F, 0F, 6, 1, 6); + Shape15.setRotationPoint(-3F, 8F, -8F); + Shape15.setTextureSize(32, 32); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0F); + Shape16 = new ModelRenderer(this, 0, 7); + Shape16.addBox(0F, 0F, 0F, 6, 1, 6); + Shape16.setRotationPoint(2F, 8F, 3F); + Shape16.setTextureSize(32, 32); + Shape16.mirror = true; + setRotation(Shape16, 0F, 1.570796F, 0F); + Shape17 = new ModelRenderer(this, 0, 7); + Shape17.addBox(0F, 0F, 0F, 6, 1, 6); + Shape17.setRotationPoint(7F, 14F, 3F); + Shape17.setTextureSize(32, 32); + Shape17.mirror = true; + setRotation(Shape17, 1.570796F, 1.570796F, 0F); + Shape18 = new ModelRenderer(this, 0, 7); + Shape18.addBox(0F, 0F, 0F, 6, 1, 6); + Shape18.setRotationPoint(-7F, 13F, -2F); + Shape18.setTextureSize(32, 32); + Shape18.mirror = true; + setRotation(Shape18, 0F, 1.570796F, 1.570796F); + Shape19 = new ModelRenderer(this, 0, 7); + Shape19.addBox(0F, 0F, 0F, 6, 1, 6); + Shape19.setRotationPoint(8F, 13F, -2F); + Shape19.setTextureSize(32, 32); + Shape19.mirror = true; + setRotation(Shape19, 0F, 1.570796F, 1.570796F); + Shape20 = new ModelRenderer(this, 0, 7); + Shape20.addBox(0F, 0F, 0F, 6, 1, 6); + Shape20.setRotationPoint(8F, 13F, 8F); + Shape20.setTextureSize(32, 32); + Shape20.mirror = true; + setRotation(Shape20, 0F, 1.570796F, 1.570796F); + Shape21 = new ModelRenderer(this, 0, 7); + Shape21.addBox(0F, 0F, 0F, 6, 1, 6); + Shape21.setRotationPoint(-3F, 14F, 7F); + Shape21.setTextureSize(32, 32); + Shape21.mirror = true; + setRotation(Shape21, 1.570796F, 0F, 0F); + Shape22 = new ModelRenderer(this, 0, 7); + Shape22.addBox(0F, 0F, 0F, 6, 1, 6); + Shape22.setRotationPoint(2F, 13F, -8F); + Shape22.setTextureSize(32, 32); + Shape22.mirror = true; + setRotation(Shape22, 1.570796F, 0F, 1.570796F); + Shape23 = new ModelRenderer(this, 0, 0); + Shape23.addBox(0F, 0F, 0F, 6, 1, 5); + Shape23.setRotationPoint(-8F, 13F, 7F); + Shape23.setTextureSize(32, 32); + Shape23.mirror = true; + setRotation(Shape23, 1.570796F, 0F, 1.570796F); + Shape24 = new ModelRenderer(this, 0, 7); + Shape24.addBox(0F, 0F, 0F, 6, 1, 6); + Shape24.setRotationPoint(2F, 13F, 7F); + Shape24.setTextureSize(32, 32); + Shape24.mirror = true; + setRotation(Shape24, 1.570796F, 0F, 1.570796F); + Shape25 = new ModelRenderer(this, 0, 15); + Shape25.addBox(0F, 0F, 0F, 8, 8, 8); + Shape25.setRotationPoint(-4F, 12F, -4F); + Shape25.setTextureSize(32, 32); + Shape25.mirror = true; + setRotation(Shape25, 0F, 0F, 0F); + } + + @Override + public void render() { + + RenderUtil.bindTexture(TEXTURE); + GL11.glPushMatrix(); + GL11.glTranslatef(0.5f, -1.5f, 0.5f); + GL11.glPushMatrix(); + + float f5 = 0.0625f; + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + Shape10.render(f5); + Shape11.render(f5); + Shape12.render(f5); + Shape13.render(f5); + Shape14.render(f5); + Shape15.render(f5); + Shape16.render(f5); + Shape17.render(f5); + Shape18.render(f5); + Shape19.render(f5); + Shape20.render(f5); + Shape21.render(f5); + Shape22.render(f5); + Shape23.render(f5); + Shape24.render(f5); + //Shape25.render(f5); + + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + public void render(TileTransceiver cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y + 1, (float) z); + render(); + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java new file mode 100644 index 00000000..cb1916f6 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -0,0 +1,130 @@ +package crazypants.enderio.machine.transceiver.render; + +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; + +public class TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { + + private IModel model; + + private BoundingBox bb; + + private boolean adjustForItem = false; + + public TransceiverRenderer() { + float scale = 0.7f; + if(Config.useAlternateTesseractModel) { + model = new TransceiverModelAlt(); + scale = 0.8f; + adjustForItem = true; + } else { + model = new TransceiverModel(); + } + bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); + } + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + + TileTransceiver cube = (TileTransceiver) te; + + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + float f = cube.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = cube.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2); + + model.render(cube, x, y, z); + if(cube.isActive()) { + renderPower(te.getWorldObj(), x, y, z, true); + } + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if(adjustForItem) { + switch (type) { + case ENTITY: + renderItem(0f, 0f, 0f); + return; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + renderItem(0f, 1f, 1f); + return; + case INVENTORY: + renderItem(0f, 0f, 0f); + return; + default: + renderItem(0f, 0f, 0f); + return; + } + } else { + renderItem(0, 0, 0); + } + } + + private void renderPower(World world, double x, double y, double z, boolean isActive) { + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + + RenderUtil.bindBlockTexture(); + IIcon icon = EnderIO.blockHyperCube.getPortalIcon(); + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if(!isActive) { + GL11.glColor4f(0, 1, 1, 0.5f); + } else { + GL11.glColor4f(1, 1, 1, 1f); + } + CubeRenderer.render(bb, icon); + tessellator.draw(); + + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_BLEND); + } + + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + model.render(); + GL11.glPopMatrix(); + } + +}