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 0000000..fd87e66 Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_sensor.png differ diff --git a/resources/weather2/textures/blocks/tornado_sensor_top.png b/resources/weather2/textures/blocks/tornado_sensor_top.png new file mode 100644 index 0000000..f7d4431 Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_sensor_top.png differ diff --git a/resources/weather2/textures/blocks/tornado_siren.png b/resources/weather2/textures/blocks/tornado_siren.png new file mode 100644 index 0000000..b27a56e Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_siren.png differ diff --git a/resources/weather2/textures/blocks/tornado_siren_manual.png b/resources/weather2/textures/blocks/tornado_siren_manual.png new file mode 100644 index 0000000..b27a56e Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_siren_manual.png differ diff --git a/resources/weather2/textures/blocks/tornado_siren_manual_on.png b/resources/weather2/textures/blocks/tornado_siren_manual_on.png new file mode 100644 index 0000000..2c90144 Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_siren_manual_on.png differ 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 0000000..2c90144 Binary files /dev/null and b/resources/weather2/textures/blocks/tornado_siren_off.png differ diff --git a/resources/weather2/textures/blocks/weather_deflector.png b/resources/weather2/textures/blocks/weather_deflector.png new file mode 100644 index 0000000..68f10c0 Binary files /dev/null and b/resources/weather2/textures/blocks/weather_deflector.png differ diff --git a/resources/weather2/textures/blocks/weather_deflector_top.png b/resources/weather2/textures/blocks/weather_deflector_top.png new file mode 100644 index 0000000..dddcf71 Binary files /dev/null and b/resources/weather2/textures/blocks/weather_deflector_top.png differ diff --git a/resources/weather2/textures/blocks/weather_forecast.png b/resources/weather2/textures/blocks/weather_forecast.png new file mode 100644 index 0000000..31b84ef Binary files /dev/null and b/resources/weather2/textures/blocks/weather_forecast.png differ 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 0000000..57f6cc3 Binary files /dev/null and b/resources/weather2/textures/blocks/weather_forecast_top.png differ diff --git a/resources/weather2/textures/blocks/weather_machine.png b/resources/weather2/textures/blocks/weather_machine.png new file mode 100644 index 0000000..a362fb3 Binary files /dev/null and b/resources/weather2/textures/blocks/weather_machine.png differ 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 0000000..d4ce11d Binary files /dev/null and b/resources/weather2/textures/blocks/weather_machine_top.png differ diff --git a/scripts/01adjustments.zs b/scripts/01adjustments.zs index eff33b0..6f3887c 100644 --- a/scripts/01adjustments.zs +++ b/scripts/01adjustments.zs @@ -160,9 +160,12 @@ recipes.addShapeless("na_lorebook", , [.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