From 40d6f196eb103068ca46a71aeb1ae6b2aa147d58 Mon Sep 17 00:00:00 2001 From: Yandols ZeonX Date: Sun, 5 May 2019 03:34:26 +0800 Subject: [PATCH] Changed the textures of the blocks from Weather2, as well as the name and description of some blocks of Weather2 and their recipes. --- Changelog.txt | 2 ++ config/Weather2/Misc.cfg | 22 +++++++++--------- .../weather2/models/block/tornado_sensor.json | 7 ++++++ .../models/block/weather_deflector.json | 7 ++++++ .../models/block/weather_forecast.json | 7 ++++++ .../models/block/weather_machine.json | 7 ++++++ .../textures/blocks/tornado_sensor.png | Bin 0 -> 625 bytes .../textures/blocks/tornado_sensor_top.png | Bin 0 -> 699 bytes .../textures/blocks/tornado_siren.png | Bin 0 -> 480 bytes .../textures/blocks/tornado_siren_manual.png | Bin 0 -> 480 bytes .../blocks/tornado_siren_manual_on.png | Bin 0 -> 478 bytes .../textures/blocks/tornado_siren_off.png | Bin 0 -> 478 bytes .../textures/blocks/weather_deflector.png | Bin 0 -> 548 bytes .../textures/blocks/weather_deflector_top.png | Bin 0 -> 519 bytes .../textures/blocks/weather_forecast.png | Bin 0 -> 637 bytes .../textures/blocks/weather_forecast_top.png | Bin 0 -> 278 bytes .../textures/blocks/weather_machine.png | Bin 0 -> 658 bytes .../textures/blocks/weather_machine_top.png | Bin 0 -> 636 bytes scripts/01adjustments.zs | 15 +++++++----- 19 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 resources/weather2/models/block/tornado_sensor.json create mode 100644 resources/weather2/models/block/weather_deflector.json create mode 100644 resources/weather2/models/block/weather_forecast.json create mode 100644 resources/weather2/models/block/weather_machine.json create mode 100644 resources/weather2/textures/blocks/tornado_sensor.png create mode 100644 resources/weather2/textures/blocks/tornado_sensor_top.png create mode 100644 resources/weather2/textures/blocks/tornado_siren.png create mode 100644 resources/weather2/textures/blocks/tornado_siren_manual.png create mode 100644 resources/weather2/textures/blocks/tornado_siren_manual_on.png create mode 100644 resources/weather2/textures/blocks/tornado_siren_off.png create mode 100644 resources/weather2/textures/blocks/weather_deflector.png create mode 100644 resources/weather2/textures/blocks/weather_deflector_top.png create mode 100644 resources/weather2/textures/blocks/weather_forecast.png create mode 100644 resources/weather2/textures/blocks/weather_forecast_top.png create mode 100644 resources/weather2/textures/blocks/weather_machine.png create mode 100644 resources/weather2/textures/blocks/weather_machine_top.png diff --git a/Changelog.txt b/Changelog.txt index 1cee1a3..cca6344 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -5,6 +5,8 @@ A02-0010: + Alterlitium Block now has a texture. [ZCM/NA] * Fixed wrong block properties for Alterlitium Block and it's Cluster/Ore. [ZCM/NA] * Changed the texture of the Alterlitium Cluster/Ore. [ZCM/NA] +* Changed the textures of Weather2 mod blocks. +* Changed the Weather2 siren sound. * Alterlitium materials now have their own oredict. * Tiered Depths has now been applied. * Mining at Y38 and below requires a pickaxe capable of mining Iron. diff --git a/config/Weather2/Misc.cfg b/config/Weather2/Misc.cfg index a4416a9..ac58444 100644 --- a/config/Weather2/Misc.cfg +++ b/config/Weather2/Misc.cfg @@ -3,17 +3,17 @@ "weather2: misc" { # Server and client side, Locks down the mod to only do wind, leaves, foliage shader if on, etc. No weather systems, turns overcast mode on B:Aesthetic_Only_Mode=false - B:Block_AnemometerNoRecipe=false - B:Block_SandLayerNoRecipe=false - B:Block_SandNoRecipe=false - B:Block_SensorNoRecipe=false - B:Block_SirenManualNoRecipe=false - B:Block_SirenNoRecipe=false - B:Block_WeatherDeflectorNoRecipe=false - B:Block_WeatherForecastNoRecipe=false - B:Block_WeatherMachineNoRecipe=false - B:Block_WeatherMachineNoTornadosOrCyclones=false - B:Block_WindVaneNoRecipe=false + B:Block_AnemometerNoRecipe=true + B:Block_SandLayerNoRecipe=true + B:Block_SandNoRecipe=true + B:Block_SensorNoRecipe=true + B:Block_SirenManualNoRecipe=true + B:Block_SirenNoRecipe=true + B:Block_WeatherDeflectorNoRecipe=true + B:Block_WeatherForecastNoRecipe=true + B:Block_WeatherMachineNoRecipe=true + B:Block_WeatherMachineNoTornadosOrCyclones=true + B:Block_WindVaneNoRecipe=true # Use if you are on a server with weather but want it ALL off client side for performance reasons, overrides basically every client based setting B:Client_PotatoPC_Mode=false diff --git a/resources/weather2/models/block/tornado_sensor.json b/resources/weather2/models/block/tornado_sensor.json new file mode 100644 index 0000000..bdd4581 --- /dev/null +++ b/resources/weather2/models/block/tornado_sensor.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "weather2:blocks/tornado_sensor_top", + "side": "weather2:blocks/tornado_sensor" + } +} \ No newline at end of file diff --git a/resources/weather2/models/block/weather_deflector.json b/resources/weather2/models/block/weather_deflector.json new file mode 100644 index 0000000..2191d66 --- /dev/null +++ b/resources/weather2/models/block/weather_deflector.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "weather2:blocks/weather_deflector_top", + "side": "weather2:blocks/weather_deflector" + } +} \ No newline at end of file diff --git a/resources/weather2/models/block/weather_forecast.json b/resources/weather2/models/block/weather_forecast.json new file mode 100644 index 0000000..0aa591e --- /dev/null +++ b/resources/weather2/models/block/weather_forecast.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "weather2:blocks/weather_forecast_top", + "side": "weather2:blocks/weather_forecast" + } +} \ No newline at end of file diff --git a/resources/weather2/models/block/weather_machine.json b/resources/weather2/models/block/weather_machine.json new file mode 100644 index 0000000..3f5381d --- /dev/null +++ b/resources/weather2/models/block/weather_machine.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "weather2:blocks/weather_machine_top", + "side": "weather2:blocks/weather_machine" + } +} \ No newline at end of file diff --git a/resources/weather2/textures/blocks/tornado_sensor.png b/resources/weather2/textures/blocks/tornado_sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..fd87e66fced791cf1a1a015c386c9840aa6d280b GIT binary patch literal 625 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 UVCbjEzW@LL07*qoM6N<$f~!}|ssI20 literal 0 HcmV?d00001 diff --git a/resources/weather2/textures/blocks/tornado_siren_off.png b/resources/weather2/textures/blocks/tornado_siren_off.png new file mode 100644 index 0000000000000000000000000000000000000000..2c901441b869fb46aa48ef9a036bdc8ef7d127fe GIT binary patch literal 478 zcmV<40U`d0P)9C1N9y3U6ss7h@!(q zVbD|U{pn2NKKw+@n$!AbT7&U;JbDWoO(qjD5VpqN8sPfcZ1{Y(+HSX==V2Iz;W!RQ z3?wlt?B#Pv^Zc!AFEEWsy)vQ(=nSplu z{ob-HMKVnjFWivOOu(dIxm+F&hpMV%bVb5qCro+0Ui&0SU}(>f92IFgow7l8LRj+J zl{9R82SHHRHSK1znIffW%1)vvf=xsv>e#sUd_L>Yg47qOa6|G74=IuWh)7~5ObIt6 z|Nn8_LjvY>I+4wCSPR^cX!G`I{CIrgjpNw1ZLwKA++s^kQven}e}%u3y3lC!4JT8D UVCbjEzW@LL07*qoM6N<$f~!}|ssI20 literal 0 HcmV?d00001 diff --git a/resources/weather2/textures/blocks/weather_deflector.png b/resources/weather2/textures/blocks/weather_deflector.png new file mode 100644 index 0000000000000000000000000000000000000000..68f10c06ca7dcaaf6da6600b06c4544b087436bd GIT binary patch literal 548 zcmV+<0^9wGP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o#qDe$SR5(wKlFh3DQ5eS6gt&~aiw#k>nx&MIl%_^Pcy-AJ6%)*lac{2R5+V?aTnM zX^mrn>qFJ?y>Z-bwihlST2{UszSqJvA`6p*Xzk-0;AvWW6WeSBnhdZP{{B1zkd-31mf|yBuVgi zz20Cjh!K7$CrQS!y^_!8JDmo5f-=R@DSyFOQFTu>t5wBob_D m!eWdB$inY8@SBheSgoJpcC#b90%6tw0000<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o#g-Jv~R5(vvlHHAhKoo^d3>w&HA22={5=+1a{A)lffDVKLFf@R^ z?UQZ;pbcOL+Q32uYXO_=elvHFbx(}mxj%ExJ!7ZW>sbwmLBHRZU@#aEn_7bosrS!s zK5rUP6iG0hP8W-X(?EK-#SECV2&(gAhX$QP{lAwsD$50B7$1(4#N-) zQU>ewS`}YS&w1ZT1fyC0A(DLGDoop1H`&kl2D^0NfMDnD^74kjPLu9&|_SZKN1!p21y8m zhwE7hXnF<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o#`$R^Zg(P)h{xkFL?RKN5s5(wngEwfCQGN&o6TmmS`~}MLZPr+F7Y>$ z$;jn$lJiVJ7aor%5D2>6?r1dfcs$i=wcTzv8jWl=>vFlqSHNghJtNx5MHv3B1GM@Gm3Gqu1+ewVK6ZK~dU)Yzas> zEFd9{tl#N$!ih0_K3^mf!6sfv7#~gWtyC(ROr~Hkh)@UysBq-vav1@yEs=|a^GDEj zyTv@IR0^xZ9XT8haN-0|9$`N&A6!V2NF?O)L0+#{DwUG8l9*=#u<-gV`2UN#AU69S XL3OXO;c!A(00000NkvXXu0mjfB}@_9 literal 0 HcmV?d00001 diff --git a/resources/weather2/textures/blocks/weather_forecast_top.png b/resources/weather2/textures/blocks/weather_forecast_top.png new file mode 100644 index 0000000000000000000000000000000000000000..57f6cc322f22f5fd20439212aab97402a158c00d GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33JwtQjy!pvMMUy>U z978Pp_f87rYBmsHZJp4v?a4p;duO|UJS;AsB(->Hzzc;P``)NEr+8@|?aG>1{LN`a z+FB#cS<^$$uYP{>vF)uU#z*}I3xegCw@A3SaU|L^b~38*EjV&rJVtwChCpb5)>4JS zhR%8Or*^FN)RxL$Dx4v?ul4ix{a5saoQ`?AtysIe=7@R4c{>H&y>3&?J6w9CR~MLj U^Bm=113Hhv)78&qol`;+09GYpi2wiq literal 0 HcmV?d00001 diff --git a/resources/weather2/textures/blocks/weather_machine.png b/resources/weather2/textures/blocks/weather_machine.png new file mode 100644 index 0000000000000000000000000000000000000000..a362fb3a6d021f5364f4623fe093fa065a76903f GIT binary patch literal 658 zcmV;D0&V??P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o$5J^NqR5(v%Qp>BUaTGlz#PvJ|Qj{bHN*<-;5%SI<&mvJ?L#3FS z$iP4b%DWULXXbA(kg0*k?EVdmByyMgednBRcc;((_HV6kueJB@jYgwUzXCaePNx$I z0y%m16>lg_e&6x?^*6X&uGMOd#bVKD)Mm5c6-6eKNnr2^l7Q0t`+F*t>h*fLT+U*# zB$LV2YBd^-B9RD=2+oUuE(`{P&1M&i#l>O~3AP|^Nr%(tODG8q$kH>hb)#}-7w%hIY`~CfX z?{qqo$pk&Yfi@P4MM{Fp<#K5@n?)iKnAhv|`FuVekMsGw*=#f#4a8I`6|GiFO7eQW z@p!yetM&W++wBG@2t*u@$5N>zlgTg!x7$rhLWU+1i3BzdhXaXyK0!tkn5oz6IC8mM zq$KpJR;z@E^?H4|T!F`gG(EtDd07*qoM6N<$f)7j}0{{R3 literal 0 HcmV?d00001 diff --git a/resources/weather2/textures/blocks/weather_machine_top.png b/resources/weather2/textures/blocks/weather_machine_top.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ce11d993bad8b7dc1be105f113f02318e7eff4 GIT binary patch literal 636 zcmV-?0)zdDP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%hhNHvLWs=l}o#`bk7VR5(v%Qa#A2VHo~O$m{>Nlq?3ZD1QTD!sKUAj0Q0&HWOJ4 z7RsjYtg;(KVIgFYpE4L;iwshJGNE&><9)vGbk4bYdp+-cU)OzK_jCK;a5(HQ;0$oN zT;>4aOmbiNK*LjhyY!9JRS-ci^bh;Hy)2So6U4O9S(noX_V#AOIJ{64Hmm;qiD>DiyRsf`Lw_ z8;wTu`5cxIPacC*{Ee4&31Y0000, [.addTooltip("set off using redstone signals."); .addTooltip("Protects your base from getting potentially"); .addTooltip("destroyed by critically bad weather."); +.addTooltip(" * Right click on it to switch deflector modes."); .addTooltip("§eWARNING: DANGEROUS!!§r"); .addTooltip("Allows you to control the weather"); .addTooltip("within the immediate area."); +.addTooltip(" * Right click on it to cycle the weather."); +.displayName = "Weather Control Machine"; .displayName = "Manual Siren"; .displayName = "Sand Layer"; @@ -207,12 +210,12 @@ recipes.addShaped("w2_weather_deflector_recipe", , [ // Mining at Y26 and below requires at least a Stone Pickaxe. // Mining at Y14 and below requires at least an Iron Pickaxe. // Mining at Y7 and below requires at least a Diamond Pickaxe. -mods.td.TieredDepths.addBlacklist(,38,0,1); -mods.td.TieredDepths.addBlacklist(,15,0,2); -mods.td.TieredDepths.addBlacklist(,7,0,3); +mods.td.TieredDepths.addBlacklist(,38,0,1); +mods.td.TieredDepths.addBlacklist(,15,0,2); +mods.td.TieredDepths.addBlacklist(,7,0,3); // Also apply to Mining World -mods.td.TieredDepths.addBlacklist(,38,-6,1); -mods.td.TieredDepths.addBlacklist(,15,-6,2); -mods.td.TieredDepths.addBlacklist(,7,-6,3); +mods.td.TieredDepths.addBlacklist(,38,-6,1); +mods.td.TieredDepths.addBlacklist(,15,-6,2); +mods.td.TieredDepths.addBlacklist(,7,-6,3); print("Initialization of 'NA01 - Adjustments for New Alterlite' has been completed."); \ No newline at end of file