From 9c90d4fc61ca61de1f4d26907c6de264f9a5ca09 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 27 Aug 2017 17:14:37 +0200 Subject: [PATCH] Fixed pumpjack animation, retrofitted gas flare, added oil can textures --- assets/hbm/models/pumpjack_base.obj | 258 +++++++++++------- assets/hbm/textures/gui/fluids2.png | Bin 12875 -> 11541 bytes assets/hbm/textures/items/oilcan_bitumen.png | Bin 0 -> 238 bytes assets/hbm/textures/items/oilcan_diesel.png | Bin 0 -> 204 bytes .../hbm/textures/items/oilcan_heatingoil.png | Bin 0 -> 234 bytes assets/hbm/textures/items/oilcan_heavyoil.png | Bin 0 -> 235 bytes assets/hbm/textures/items/oilcan_kerosene.png | Bin 0 -> 230 bytes assets/hbm/textures/items/oilcan_lightoil.png | Bin 0 -> 237 bytes .../hbm/textures/items/oilcan_lubricant.png | Bin 0 -> 221 bytes assets/hbm/textures/items/oilcan_naphtha.png | Bin 0 -> 236 bytes assets/hbm/textures/items/oilcan_oil.png | Bin 0 -> 208 bytes assets/hbm/textures/items/oilcan_petroil.png | Bin 0 -> 246 bytes .../hbm/textures/items/oilcan_reclaimed.png | Bin 0 -> 238 bytes assets/hbm/textures/items/oilcan_smear.png | Bin 0 -> 228 bytes com/hbm/handler/FluidTypeHandler.java | 6 +- .../container/ContainerMachineGasFlare.java | 16 +- com/hbm/inventory/gui/GUIMachineGasFlare.java | 18 +- com/hbm/items/ModItems.java | 5 - com/hbm/lib/Library.java | 5 + com/hbm/render/tileentity/RenderPumpjack.java | 13 +- .../tileentity/TileEntityMachineGasFlare.java | 66 ++--- 21 files changed, 231 insertions(+), 156 deletions(-) create mode 100644 assets/hbm/textures/items/oilcan_bitumen.png create mode 100644 assets/hbm/textures/items/oilcan_diesel.png create mode 100644 assets/hbm/textures/items/oilcan_heatingoil.png create mode 100644 assets/hbm/textures/items/oilcan_heavyoil.png create mode 100644 assets/hbm/textures/items/oilcan_kerosene.png create mode 100644 assets/hbm/textures/items/oilcan_lightoil.png create mode 100644 assets/hbm/textures/items/oilcan_lubricant.png create mode 100644 assets/hbm/textures/items/oilcan_naphtha.png create mode 100644 assets/hbm/textures/items/oilcan_oil.png create mode 100644 assets/hbm/textures/items/oilcan_petroil.png create mode 100644 assets/hbm/textures/items/oilcan_reclaimed.png create mode 100644 assets/hbm/textures/items/oilcan_smear.png diff --git a/assets/hbm/models/pumpjack_base.obj b/assets/hbm/models/pumpjack_base.obj index 5f737a734..2cb7c4a75 100644 --- a/assets/hbm/models/pumpjack_base.obj +++ b/assets/hbm/models/pumpjack_base.obj @@ -233,16 +233,30 @@ v -0.750000 0.343750 -1.843750 v -0.750000 0.656250 -1.843750 v -0.750000 0.343750 -2.156250 v -0.750000 0.656250 -2.156250 -vn 0.000000 1.000000 0.000000 +v -0.375000 -0.000000 0.375000 +v -0.375000 0.050000 0.375000 +v -0.375000 -0.000000 -0.375000 +v -0.375000 0.050000 -0.375000 +v 0.375000 -0.000000 0.375000 +v 0.375000 0.050000 0.375000 +v 0.375000 -0.000000 -0.375000 +v 0.375000 0.050000 -0.375000 +v 1.500000 1.500000 0.500000 +v 1.500000 1.500000 -6.500000 +v -1.500000 1.500000 0.500000 +v -1.500000 1.500000 -6.500000 +v 1.500000 0.150000 -6.500000 +v -1.500000 0.150000 -6.500000 +vn 0.000000 -1.000000 0.000000 vn 0.382700 0.000000 -0.923900 vn 0.923900 0.000000 -0.382700 vn 0.923900 0.000000 0.382700 vn 0.382700 0.000000 0.923900 vn -0.382700 0.000000 0.923900 vn -0.923900 0.000000 0.382700 +vn 0.000000 1.000000 -0.000000 vn -0.382700 0.000000 -0.923900 vn -0.923900 0.000000 -0.382700 -vn 0.000000 -1.000000 0.000000 vn -1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000 vn 0.000000 0.000000 1.000000 @@ -303,37 +317,37 @@ vn 0.000000 -0.382700 -0.923900 vn 0.000000 0.923900 -0.382700 vn -0.000000 0.923900 0.382700 s off -f 2//1 4//1 3//1 +f 239//1 237//1 233//1 f 6//2 8//2 7//2 f 8//3 10//3 9//3 f 10//4 12//4 11//4 f 12//5 14//5 13//5 f 14//6 16//6 15//6 f 16//7 18//7 17//7 -f 18//1 14//1 6//1 -f 20//8 6//8 5//8 -f 18//9 20//9 19//9 -f 11//10 15//10 19//10 +f 18//8 14//8 6//8 +f 20//9 6//9 5//9 +f 18//10 20//10 19//10 +f 11//1 15//1 19//1 f 24//11 23//11 21//11 f 26//12 25//12 27//12 f 22//13 21//13 25//13 f 33//12 35//12 48//12 f 36//14 35//14 31//14 f 30//13 29//13 33//13 -f 60//10 51//10 49//10 -f 50//10 44//10 43//10 -f 58//10 56//10 55//10 -f 56//10 43//10 41//10 -f 46//1 48//1 47//1 -f 40//1 38//1 37//1 -f 49//10 43//10 56//10 +f 60//1 51//1 49//1 +f 50//1 44//1 43//1 +f 58//1 56//1 55//1 +f 56//1 43//1 41//1 +f 46//8 48//8 47//8 +f 40//8 38//8 37//8 +f 49//1 43//1 56//1 f 50//12 39//12 44//12 f 60//14 38//14 51//14 f 57//11 55//11 38//11 f 41//13 39//13 54//13 -f 62//1 64//1 63//1 -f 66//1 68//1 67//1 -f 70//1 72//1 71//1 +f 62//8 64//8 63//8 +f 66//8 68//8 67//8 +f 70//8 72//8 71//8 f 89//15 46//15 48//15 f 89//16 91//16 45//16 f 94//15 93//15 62//15 @@ -350,12 +364,12 @@ f 119//22 66//22 68//22 f 101//17 103//17 72//17 f 102//20 69//20 70//20 f 103//22 104//22 70//22 -f 68//1 66//1 45//1 -f 72//1 70//1 61//1 +f 68//8 66//8 45//8 +f 72//8 70//8 61//8 f 31//11 29//11 69//11 -f 72//1 63//1 36//1 -f 45//1 66//1 30//1 -f 47//1 48//1 61//1 +f 72//8 63//8 36//8 +f 45//8 66//8 30//8 +f 47//8 48//8 61//8 f 87//19 75//19 76//19 f 85//20 88//20 76//20 f 86//17 74//17 75//17 @@ -407,10 +421,10 @@ f 110//21 109//21 117//21 f 61//23 62//23 90//23 f 92//24 90//24 73//24 f 82//25 73//25 76//25 -f 84//1 82//1 85//1 -f 108//1 106//1 113//1 -f 88//1 87//1 107//1 -f 116//1 115//1 83//1 +f 84//8 82//8 85//8 +f 108//8 106//8 113//8 +f 88//8 87//8 107//8 +f 116//8 115//8 83//8 f 85//26 78//26 80//26 f 96//27 93//27 78//27 f 93//28 48//28 47//28 @@ -472,12 +486,12 @@ f 154//12 152//12 164//12 f 164//12 152//12 162//12 f 162//12 152//12 160//12 f 150//12 160//12 152//12 -f 33//1 29//1 22//1 -f 26//1 28//1 35//1 -f 22//1 29//1 31//1 -f 152//1 151//1 31//1 -f 24//1 31//1 151//1 -f 152//1 35//1 28//1 +f 33//8 29//8 22//8 +f 26//8 28//8 35//8 +f 22//8 29//8 31//8 +f 152//8 151//8 31//8 +f 24//8 31//8 151//8 +f 152//8 35//8 28//8 f 166//54 168//54 167//54 f 168//55 170//55 169//55 f 170//56 172//56 171//56 @@ -501,45 +515,66 @@ f 204//11 203//11 201//11 f 208//14 207//14 203//14 f 206//12 205//12 207//12 f 202//13 201//13 205//13 -f 203//10 207//10 205//10 -f 208//1 204//1 202//1 +f 203//1 207//1 205//1 +f 208//8 204//8 202//8 f 212//11 211//11 209//11 f 216//14 215//14 211//14 f 214//12 213//12 215//12 f 210//13 209//13 213//13 -f 211//10 215//10 213//10 -f 216//1 212//1 210//1 +f 211//1 215//1 213//1 +f 216//8 212//8 210//8 f 220//11 219//11 217//11 f 224//14 223//14 219//14 f 222//12 221//12 223//12 f 218//13 217//13 221//13 -f 219//10 223//10 221//10 -f 224//1 220//1 218//1 +f 219//1 223//1 221//1 +f 224//8 220//8 218//8 f 228//11 227//11 225//11 f 232//14 231//14 227//14 f 230//12 229//12 231//12 f 226//13 225//13 229//13 -f 227//10 231//10 229//10 -f 232//1 228//1 226//1 -f 1//1 2//1 3//1 +f 227//1 231//1 229//1 +f 232//8 228//8 226//8 +f 236//11 235//11 233//11 +f 240//14 239//14 235//14 +f 238//12 237//12 239//12 +f 234//13 233//13 237//13 +f 28//14 150//14 122//14 +f 240//8 236//8 234//8 +f 28//14 245//14 4//14 +f 2//13 241//13 243//13 +f 23//14 3//14 246//14 +f 149//14 24//14 121//14 +f 208//12 207//12 213//12 +f 206//12 241//12 2//12 +f 215//12 4//12 245//12 +f 4//12 213//12 2//12 +f 216//12 241//12 214//12 +f 217//11 227//11 228//11 +f 1//11 243//11 226//11 +f 246//11 219//11 220//11 +f 243//11 244//11 218//11 +f 1//11 217//11 219//11 +f 27//1 25//1 21//1 +f 235//1 239//1 233//1 f 5//2 6//2 7//2 f 7//3 8//3 9//3 f 9//4 10//4 11//4 f 11//5 12//5 13//5 f 13//6 14//6 15//6 f 15//7 16//7 17//7 -f 10//1 8//1 6//1 -f 6//1 20//1 18//1 -f 18//1 16//1 14//1 -f 14//1 12//1 10//1 -f 10//1 6//1 14//1 -f 19//8 20//8 5//8 -f 17//9 18//9 19//9 -f 19//10 5//10 11//10 -f 7//10 9//10 11//10 -f 11//10 13//10 15//10 -f 15//10 17//10 19//10 -f 5//10 7//10 11//10 +f 10//8 8//8 6//8 +f 6//8 20//8 18//8 +f 18//8 16//8 14//8 +f 14//8 12//8 10//8 +f 10//8 6//8 14//8 +f 19//9 20//9 5//9 +f 17//10 18//10 19//10 +f 19//1 5//1 11//1 +f 7//1 9//1 11//1 +f 11//1 13//1 15//1 +f 15//1 17//1 19//1 +f 5//1 7//1 11//1 f 22//11 24//11 21//11 f 28//12 26//12 27//12 f 26//13 22//13 25//13 @@ -550,13 +585,13 @@ f 35//12 36//12 64//12 f 62//12 48//12 35//12 f 32//14 36//14 31//14 f 34//13 30//13 33//13 -f 58//10 60//10 49//10 -f 49//10 50//10 43//10 -f 57//10 58//10 55//10 -f 54//10 56//10 41//10 -f 45//1 46//1 47//1 -f 39//1 40//1 37//1 -f 58//10 49//10 56//10 +f 58//1 60//1 49//1 +f 49//1 50//1 43//1 +f 57//1 58//1 55//1 +f 54//1 56//1 41//1 +f 45//8 46//8 47//8 +f 39//8 40//8 37//8 +f 58//1 49//1 56//1 f 42//12 44//12 39//12 f 50//12 52//12 40//12 f 40//12 39//12 50//12 @@ -569,9 +604,9 @@ f 55//11 53//11 37//11 f 53//13 54//13 37//13 f 41//13 42//13 39//13 f 39//13 37//13 54//13 -f 61//1 62//1 63//1 -f 65//1 66//1 67//1 -f 69//1 70//1 71//1 +f 61//8 62//8 63//8 +f 65//8 66//8 67//8 +f 69//8 70//8 71//8 f 90//15 89//15 48//15 f 46//16 89//16 45//16 f 64//15 94//15 62//15 @@ -588,24 +623,24 @@ f 120//22 119//22 68//22 f 71//17 101//17 72//17 f 104//20 102//20 70//20 f 72//22 103//22 70//22 -f 47//1 68//1 45//1 -f 63//1 72//1 61//1 +f 47//8 68//8 45//8 +f 63//8 72//8 61//8 f 65//11 67//11 29//11 f 69//11 71//11 31//11 f 32//11 31//11 71//11 f 29//11 30//11 65//11 f 67//11 69//11 29//11 -f 36//1 32//1 72//1 -f 71//1 72//1 32//1 -f 63//1 64//1 36//1 -f 30//1 34//1 45//1 -f 46//1 45//1 34//1 -f 66//1 65//1 30//1 -f 61//1 70//1 68//1 -f 69//1 67//1 68//1 -f 68//1 47//1 61//1 -f 48//1 62//1 61//1 -f 70//1 69//1 68//1 +f 36//8 32//8 72//8 +f 71//8 72//8 32//8 +f 63//8 64//8 36//8 +f 30//8 34//8 45//8 +f 46//8 45//8 34//8 +f 66//8 65//8 30//8 +f 61//8 70//8 68//8 +f 69//8 67//8 68//8 +f 68//8 47//8 61//8 +f 48//8 62//8 61//8 +f 70//8 69//8 68//8 f 88//19 87//19 76//19 f 73//20 85//20 76//20 f 87//17 86//17 75//17 @@ -657,10 +692,10 @@ f 118//21 110//21 117//21 f 92//23 61//23 90//23 f 76//24 92//24 73//24 f 84//25 82//25 76//25 -f 88//1 84//1 85//1 -f 116//1 108//1 113//1 -f 108//1 88//1 107//1 -f 84//1 116//1 83//1 +f 88//8 84//8 85//8 +f 116//8 108//8 113//8 +f 108//8 88//8 107//8 +f 84//8 116//8 83//8 f 88//26 85//26 80//26 f 80//27 96//27 78//27 f 96//28 93//28 47//28 @@ -728,12 +763,12 @@ f 127//49 125//49 159//49 f 129//50 127//50 161//50 f 131//51 129//51 163//51 f 133//52 131//52 147//52 -f 26//1 33//1 22//1 -f 33//1 26//1 35//1 -f 24//1 22//1 31//1 -f 35//1 152//1 31//1 -f 149//1 24//1 151//1 -f 150//1 152//1 28//1 +f 26//8 33//8 22//8 +f 33//8 26//8 35//8 +f 24//8 22//8 31//8 +f 35//8 152//8 31//8 +f 149//8 24//8 151//8 +f 150//8 152//8 28//8 f 165//54 166//54 167//54 f 167//55 168//55 169//55 f 169//56 170//56 171//56 @@ -765,23 +800,58 @@ f 202//11 204//11 201//11 f 204//14 208//14 203//14 f 208//12 206//12 207//12 f 206//13 202//13 205//13 -f 201//10 203//10 205//10 -f 206//1 208//1 202//1 +f 201//1 203//1 205//1 +f 206//8 208//8 202//8 f 210//11 212//11 209//11 f 212//14 216//14 211//14 f 216//12 214//12 215//12 f 214//13 210//13 213//13 -f 209//10 211//10 213//10 -f 214//1 216//1 210//1 +f 209//1 211//1 213//1 +f 214//8 216//8 210//8 f 218//11 220//11 217//11 f 220//14 224//14 219//14 f 224//12 222//12 223//12 f 222//13 218//13 221//13 -f 217//10 219//10 221//10 -f 222//1 224//1 218//1 +f 217//1 219//1 221//1 +f 222//8 224//8 218//8 f 226//11 228//11 225//11 f 228//14 232//14 227//14 f 232//12 230//12 231//12 f 230//13 226//13 229//13 -f 225//10 227//10 229//10 -f 230//1 232//1 226//1 +f 225//1 227//1 229//1 +f 230//8 232//8 226//8 +f 234//11 236//11 233//11 +f 236//14 240//14 235//14 +f 240//12 238//12 239//12 +f 238//13 234//13 237//13 +f 122//14 242//14 28//14 +f 245//14 28//14 242//14 +f 150//14 146//14 122//14 +f 238//8 240//8 234//8 +f 27//14 28//14 4//14 +f 1//13 2//13 243//13 +f 24//14 23//14 246//14 +f 244//14 121//14 24//14 +f 145//14 149//14 121//14 +f 24//14 246//14 244//14 +f 214//12 208//12 213//12 +f 205//12 206//12 2//12 +f 245//12 242//12 216//12 +f 216//12 215//12 245//12 +f 205//12 2//12 207//12 +f 4//12 215//12 213//12 +f 213//12 207//12 2//12 +f 208//12 214//12 241//12 +f 216//12 242//12 241//12 +f 241//12 206//12 208//12 +f 218//11 217//11 228//11 +f 225//11 1//11 226//11 +f 220//11 244//11 246//11 +f 246//11 3//11 219//11 +f 218//11 228//11 243//11 +f 226//11 243//11 228//11 +f 244//11 220//11 218//11 +f 219//11 3//11 1//11 +f 1//11 225//11 227//11 +f 227//11 217//11 1//11 +f 23//1 27//1 21//1 diff --git a/assets/hbm/textures/gui/fluids2.png b/assets/hbm/textures/gui/fluids2.png index df2cb79b843e26a583158584d737f272ee9495a5..9faa6360b4f955e02958b7c7ae274ea5ece9c9b8 100755 GIT binary patch literal 11541 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 diff --git a/assets/hbm/textures/items/oilcan_bitumen.png b/assets/hbm/textures/items/oilcan_bitumen.png new file mode 100644 index 0000000000000000000000000000000000000000..53b9537c76bd843a4ceb02cea2cd91913a021565 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU$h+kKYYBiuPs(jS>_-#GD%%j^;FU(GK(-U3ZKu6yuJU|!Se!=a+xlpANf z`Tm)@Gdw+ zGWYT0pG*qpi+`#8TK9U^sxO=F?u?ikm&TBLTgXYE;b)Si)wZCi^Q$w?FgS5cy0!iM l+ajqob22}zK6zwFVdQ&MBb@02RSZ AcmMzZ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/oilcan_heatingoil.png b/assets/hbm/textures/items/oilcan_heatingoil.png new file mode 100644 index 0000000000000000000000000000000000000000..8abf6d0ffcd63482811590e34e4a93e841630689 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfUn+ zKW7dcyMH3;u!L}M?Dem&?u4J()Z_i{ZI#^Lqfe42x-%>l@swY`eM##3zb`l&wwC$i ztma~fed6Q1Bd6|T5=7U)<8Pgg&ebxsLQ0Ntx!z5oCK literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/oilcan_heavyoil.png b/assets/hbm/textures/items/oilcan_heavyoil.png new file mode 100644 index 0000000000000000000000000000000000000000..371de24219cfb39979eaf3858a419216351d1838 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf-~j33?>_x0t^{M4xICxmE5qpK{SD3)`Vj#-<1dnxO$z=&bfI%e%r%G z`Bx$ruhQCBdH?(JUF)Z$YPx@2mm6biA#@~Aqfq2jb#>sAnLn6gZ=cwtbIyhFO6gmc zsO)Sehe;|7OES3**qrBiyrj!!a^jpTya}=4J%-=T9p0*Y*h15ujp3L?Y1#Voe?Q)_ gz5Mq<_~dR|c`Ikjo9AFVdQ&MBb@04gC|W&i*H literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/oilcan_kerosene.png b/assets/hbm/textures/items/oilcan_kerosene.png new file mode 100644 index 0000000000000000000000000000000000000000..3df5212ff95cf28dad1282fd8ea9682daccb6067 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf;HZUMZGti3%)UIyOg$2XNu_rn+9nqvxcS;xd$3+B3w2K3gyNXFRw3; z|KHHOKQa5koXK1H6-~bHOIka1mR`AL)z!#n(Qy~7xOcJZr&!kMxhgYMyzhQ&XtWqe}eJYWKRsH{9m+2b*l0$m_tt_~{-K0o}{s>FVdQ&MBb@05^nS!vFvP literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/oilcan_lubricant.png b/assets/hbm/textures/items/oilcan_lubricant.png new file mode 100644 index 0000000000000000000000000000000000000000..9cee0151369e1a416c08b31b7b81ac161ad3eecc GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf;Lr@lZ&m`Bo$_^xxIm1^1zRbQt4BEE{h6=YF+4?`}_0503*!ceH zeq*~=9s64%x%~a=ImNdgt(tyn_PJjUksG!(Y-X)Yx1AT9%F-a= z33W|sf$?FPLjDXBirYG-mn4L2DMwN8L9_|lr8GG@)X|UM9>=clu;SpMPLPb^~dyCNZd4U#7S6yLIEPT8B z#=mX*b0U69pETWaP4QXm_0;G4fxhpR;y*+V;38TR= zpT38GnHK1HKU3TI?)SWFRy*hTFWl;9#_-tU(Oz+ey|>lQ_ied$(ngHoUiHbp*3YBN jyQg>0_>;A1(-UUBP*d*QT|55)oy*|q>gTe~DWM4fqJCh_ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/oilcan_oil.png b/assets/hbm/textures/items/oilcan_oil.png new file mode 100644 index 0000000000000000000000000000000000000000..0cfbdc54f4fb91df4ee27aed5308a41e70611f9d GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vffp7qW2(7BR~4w|V_*=yAf?q*>K5mjQ*uj=p+VDS3j3^P6hCW>L3Hg1=(QK{NJ<)x3>= z6mC2-HU50|%yAx{KfOGrQ-bWCq(<_c>)jN&zGi-%<$S5V*DI&z+B(P_Z>gx>qoQN| zT*{YW%eCIe$M-UNOlsNYxnlLILr+>|_^b0jIi)d_#wM>7ZFrh=ue$8Olh!TCED39; rn)telGp_rd{`{$i%KlkCB|n+0T}Qh!pLOC%lfRP4Li}G@XfEC?)mm5g{MeN#YUm3-|*tPID5x{hkX})K4;$5-+8OW)0u+1W(9@BPu#U>m;4Ls<%Y+ux-i_@7R!3rKxMMO z2^&MUE`uV=GE0xx$hprH%o|c8Kipex?SI|Rr+7lG4#S@BlXjP%|NGI#rugr{^=jho Z_p*&FI~iZe9RWI%!PC{xWt~$(69942R|Nn7 literal 0 HcmV?d00001 diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 4a0a7ff02..536fa24bc 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -15,7 +15,7 @@ public class FluidTypeHandler { TRITIUM (0x000099, 153, 5, 1, "hbmfluid.tritium"), OIL (0x020202, 131586, 6, 1, "hbmfluid.oil"), - HOTOIL (0x020202, 131586, 8, 1, "hbmfluid.hotoil"), + HOTOIL (0x300900, 3148032, 8, 1, "hbmfluid.hotoil"), HEAVYOIL (0x141312, 1315602, 2, 2, "hbmfluid.heavyoil"), BITUMEN (0x1f2426, 2040870, 3, 2, "hbmfluid.bitumen"), @@ -42,8 +42,8 @@ public class FluidTypeHandler { AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"), ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"), - ACID (0x020202, 11862016, 10, 2, "hbmfluid.acid"), - WATZ (0x020202, 11862016, 11, 2, "hbmfluid.watz"); + ACID (0xfff7aa, 16775082, 10, 2, "hbmfluid.acid"), + WATZ (0x86653E, 8807742, 11, 2, "hbmfluid.watz"); private int color; diff --git a/com/hbm/inventory/container/ContainerMachineGasFlare.java b/com/hbm/inventory/container/ContainerMachineGasFlare.java index 6a12127e3..212151125 100644 --- a/com/hbm/inventory/container/ContainerMachineGasFlare.java +++ b/com/hbm/inventory/container/ContainerMachineGasFlare.java @@ -12,11 +12,9 @@ import net.minecraft.item.ItemStack; public class ContainerMachineGasFlare extends Container { private TileEntityMachineGasFlare testNuke; - private int gas; private int power; public ContainerMachineGasFlare(InventoryPlayer invPlayer, TileEntityMachineGasFlare tedf) { - gas = 0; power = 0; testNuke = tedf; @@ -42,8 +40,7 @@ public class ContainerMachineGasFlare extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.testNuke.gas); - crafting.sendProgressBarUpdate(this, 1, this.testNuke.power); + crafting.sendProgressBarUpdate(this, 0, this.testNuke.power); } @Override @@ -94,27 +91,18 @@ public class ContainerMachineGasFlare extends Container { { ICrafting par1 = (ICrafting)this.crafters.get(i); - if(this.gas != this.testNuke.gas) - { - par1.sendProgressBarUpdate(this, 0, this.testNuke.gas); - } if(this.power != this.testNuke.power) { - par1.sendProgressBarUpdate(this, 1, this.testNuke.power); + par1.sendProgressBarUpdate(this, 0, this.testNuke.power); } } - this.gas = this.testNuke.gas; this.power = this.testNuke.power; } @Override public void updateProgressBar(int i, int j) { if(i == 0) - { - testNuke.gas = j; - } - if(i == 1) { testNuke.power = j; } diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index a8bfa9b70..af6c276de 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -2,6 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; +import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineGasFlare; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineGasFlare; @@ -11,7 +12,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUIMachineGasFlare extends GuiContainer { +public class GUIMachineGasFlare extends GuiFluidContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_gasFlare.png"); private TileEntityMachineGasFlare flare; @@ -23,6 +24,13 @@ public class GUIMachineGasFlare extends GuiContainer { this.xSize = 176; this.ySize = 166; } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + flare.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 69 - 52, 34, 52); + } @Override protected void drawGuiContainerForegroundLayer( int i, int j) { @@ -38,9 +46,13 @@ public class GUIMachineGasFlare extends GuiContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = flare.getGasScaled(52); - drawTexturedModalRect(guiLeft + 80, guiTop + 69 - i, 192, 52 - i, 34, i); int j = flare.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - j, 176, 52 - j, 16, j); + + Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); + + flare.tank.renderTank(this, guiLeft + 80, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); + flare.tank.renderTank(this, guiLeft + 80 + 16, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52); + flare.tank.renderTank(this, guiLeft + 80 + 32, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 2, 52); } } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 160810d80..d1d31c74b 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -360,7 +360,6 @@ public class ModItems { public static Item inf_antimatter; public static Item inf_antischrabidium; - public static Item oil_canola; public static Item canister_empty; public static Item canister_smear; public static Item canister_canola; @@ -1320,7 +1319,6 @@ public class ModItems { thermo_element = new Item().setUnlocalizedName("thermo_element").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":thermo_element"); limiter = new Item().setUnlocalizedName("limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":limiter"); - oil_canola = new Item().setUnlocalizedName("oil_canola").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":oil_canola"); canister_empty = new ItemCustomLore().setUnlocalizedName("canister_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":canister_empty"); canister_smear = new ItemCustomLore().setUnlocalizedName("canister_smear").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_smear"); canister_canola = new ItemCustomLore().setUnlocalizedName("canister_canola").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_canola"); @@ -2308,9 +2306,6 @@ public class ModItems { //Large Tanks GameRegistry.registerItem(tank_waste, tank_waste.getUnlocalizedName()); - - //Oils - GameRegistry.registerItem(oil_canola, oil_canola.getUnlocalizedName()); //Canisters GameRegistry.registerItem(canister_empty, canister_empty.getUnlocalizedName()); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index a661f02cc..40f3b63fb 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -1191,6 +1191,11 @@ public class Library { { tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); } + //Gas Flare + if(block == ModBlocks.dummy_port_flare) + { + tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); + } if(tileentity == that) tileentity = null; diff --git a/com/hbm/render/tileentity/RenderPumpjack.java b/com/hbm/render/tileentity/RenderPumpjack.java index e11cccb9a..b04871fe5 100644 --- a/com/hbm/render/tileentity/RenderPumpjack.java +++ b/com/hbm/render/tileentity/RenderPumpjack.java @@ -68,7 +68,7 @@ public class RenderPumpjack extends TileEntitySpecialRenderer { GL11.glRotatef(180, 0F, 1F, 0F); this.bindTexture(gadgetTexture); - float t = (float) Math.sin((i / (180 / Math.PI)))/2 * 25; + float t = (float) Math.sin((i / (180 / Math.PI))) * 15; GL11.glRotatef(t, 1F, 0F, 0F); ResourceManager.pumpjack_head.renderAll(); @@ -85,10 +85,13 @@ public class RenderPumpjack extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); + float j = (float) Math.sin((i / (180 / Math.PI))) * 15; float t = (float) Math.sin((i / (180 / Math.PI))); float u = (float) Math.sin(((i + 90) / (180 / Math.PI))); - drawConnection(0.55, 0.5 + t, -5.5 - u, 0.55, 2.5, -6); - drawConnection(-0.55, 0.5 + t, -5.5 - u, -0.55, 2.5, -6); + float v = (float) Math.sin((j / (180 / Math.PI))) * 3; + float w = (float) Math.sin(((j + 90) / (180 / Math.PI))) * 3; + drawConnection(0.55, 0.5 + t, -5.5 - u, 0.55, 2.5 + v, -2.5 - w); + drawConnection(-0.55, 0.5 + t, -5.5 - u, -0.55, 2.5 + v, -2.5 - w); GL11.glPopMatrix(); } @@ -99,14 +102,14 @@ public class RenderPumpjack extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); Tessellator tessellator = Tessellator.instance; tessellator.startDrawing(5); - tessellator.setColorRGBA_F(0.683F, 0.089F, 0.0F, 1.0F); + tessellator.setColorRGBA_F(0.6F, 0.6F, 0.6F, 1.0F); tessellator.addVertex(x + 0.05F, y, z); tessellator.addVertex(x - 0.05F, y, z); tessellator.addVertex(a + 0.05F, b, c); tessellator.addVertex(a - 0.05F, b, c); tessellator.draw(); tessellator.startDrawing(5); - tessellator.setColorRGBA_F(0.683F, 0.089F, 0.0F, 1.0F); + tessellator.setColorRGBA_F(0.6F, 0.6F, 0.6F, 1.0F); tessellator.addVertex(x, y, z + 0.05F); tessellator.addVertex(x, y, z - 0.05F); tessellator.addVertex(a, b, c + 0.05F); diff --git a/com/hbm/tileentity/TileEntityMachineGasFlare.java b/com/hbm/tileentity/TileEntityMachineGasFlare.java index cc6f40594..0dd9f4b8d 100644 --- a/com/hbm/tileentity/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/TileEntityMachineGasFlare.java @@ -6,9 +6,13 @@ import java.util.Random; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionThermo; +import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IGasAcceptor; import com.hbm.interfaces.ISource; +import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; @@ -23,16 +27,16 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -public class TileEntityMachineGasFlare extends TileEntity implements ISidedInventory, ISource, IGasAcceptor { +public class TileEntityMachineGasFlare extends TileEntity implements ISidedInventory, ISource, IFluidContainer, IFluidAcceptor { private ItemStack slots[]; - public int gas; public int power; public static final int maxPower = 100000; public static final int maxGas = 64 * 50; public int age = 0; public List list = new ArrayList(); + public FluidTank tank; private static final int[] slots_top = new int[] {1}; private static final int[] slots_bottom = new int[] {2, 0}; @@ -43,6 +47,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven public TileEntityMachineGasFlare() { slots = new ItemStack[3]; + tank = new FluidTank(FluidType.GAS, 64000, 0); } @Override @@ -151,7 +156,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven NBTTagList list = nbt.getTagList("items", 10); this.power = nbt.getInteger("powerTime"); - this.gas = nbt.getInteger("gas"); + tank.readFromNBT(nbt, "gas"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -169,7 +174,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); nbt.setInteger("powerTime", power); - nbt.setInteger("gas", gas); + tank.writeToNBT(nbt, "gas"); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -201,10 +206,6 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven return false; } - public int getGasScaled(int i) { - return (gas * i) / maxGas; - } - public int getPowerScaled(int i) { return (power * i) / maxPower; } @@ -220,25 +221,15 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven if(!worldObj.isRemote) { - if(slots[1] != null && slots[1].getItem() == ModItems.gas_full && gas + 50 <= maxGas) { - if(slots[2] == null) { - gas += 50; - slots[1].stackSize--; - if(slots[1].stackSize <= 0) - slots[1] = null; - slots[2] = new ItemStack(ModItems.gas_empty); - }else if(slots[2] != null && slots[2].getItem() == ModItems.gas_empty && slots[2].stackSize < slots[2].getMaxStackSize()) { - gas += 50; - slots[1].stackSize--; - if(slots[1].stackSize <= 0) - slots[1] = null; - slots[2].stackSize++; - } - } + tank.loadTank(1, 2, slots); + tank.updateTank(xCoord, yCoord, zCoord); - if(gas >= 0) { - gas--; - power += 5; + if(tank.getFill() >= 10) { + tank.setFill(tank.getFill() - 10); + power += 50; + + if(power > maxPower) + power = maxPower; worldObj.spawnEntityInWorld(new EntityGasFlameFX(worldObj, this.xCoord + 0.5F, this.yCoord + 11F, this.zCoord + 0.5F, 0.0, 0.0, 0.0)); ExplosionThermo.setEntitiesOnFire(worldObj, this.xCoord, this.yCoord + 11, zCoord, 5); @@ -308,17 +299,28 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven } @Override - public void setGasFill(int i) { - this.gas = i; + public void setFillstate(int fill, int index) { + tank.setFill(fill); } @Override - public int getGasFill() { - return this.gas; + public void setType(FluidType type, int index) { + tank.setTankType(type); } @Override - public int getMaxGasFill() { - return TileEntityMachineGasFlare.maxGas; + public int getMaxAFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; + } + + @Override + public int getAFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + } + + @Override + public void setAFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); } }