Ntm space compat (#4)

* 1.3.142 - spec fork compat

CHANGELOG.MD

@@ -0,0 +1,11 @@
+# 1.3.142
+
+**Attention: for the correct operation of biome temperatures on planets, go to: `Enviromine menu - Custom Editor - Profile settings - default_settings.cfg - Config - Generate Defaults - true`**
+
+
+* Added support for Hbm's NTM Space fork
+  * Default temperature values on other planets
+    * Temperature (depending on distance from the sun): closer than the Earth? very hot: further than the Earth? : very cold
+  * Air vent allows you to breathe and maintains a comfortable temperature in the immediate area
+  * Change in temperature values if the planet was terraformed (transition to more comfortable temperatures)
+  * Improved compatibility for armor with temperatures (canSeal from space fork)

README.md

@@ -1,31 +1,30 @@
-# EnviroMine ~~for Galaxy Odyssey~~ continuation
-### based on [EnviroMine for Galaxy Odyssey](https://gitgud.io/AstroTibs/enviromine-for-galaxy-odyssey) by [AstroTibs](https://gitgud.io/AstroTibs)
+## EnviroMine ~~for Galaxy Odyssey~~ continuation
+#### based on [EnviroMine for Galaxy Odyssey](https://gitgud.io/AstroTibs/enviromine-for-galaxy-odyssey) by [AstroTibs](https://gitgud.io/AstroTibs)
 
 
 
 ## Physics for blocks is disabled by default!
-### To use it, go to: `Enviromine menu -> Custom editor -> Profile settings -> default_settings.cfg -> general -> Enable Physics -> true`,
-### then go to: `Profile settings -> default_settings.cfg -> Config -> Generate Blank Configs` and `Generate Defaults -> true` (both)
-### Please note, this is a very long process! may take up to 30 minutes of real time if you are using a large modpack
+#### To use it, go to: `Enviromine menu -> Custom editor -> Profile settings -> default_settings.cfg -> general -> Enable Physics -> true`,
+#### then go to: `Profile settings -> default_settings.cfg -> Config -> Generate Blank Configs` and `Generate Defaults -> true` (both)
+#### Please note, this is a very long process! may take up to 30 minutes of real time if you are using a large modpack
 
 ## Differences from the Galaxy Odyssey version:
 
-### 1) more sanity debuffs (due to the fact that sanity in the original enviromine does almost nothing dangerous (+, from 1.3.134 version, if your sanity is less than or equal to 5 (but greater than 0) you will die from a heart attack after 1 minute, but if your sanity is 0, then you will die after 30 seconds, and, if more than 30 seconds have passed and your sanity has JUST dropped to 0, you will die instantly(configurable + you can disable death, but instead, some debuffs will become of a higher level))
+#### 1) more sanity debuffs (due to the fact that sanity in the original enviromine does almost nothing dangerous (+, from 1.3.134 version, if your sanity is less than or equal to 5 (but greater than 0) you will die from a heart attack after 1 minute, but if your sanity is 0, then you will die after 30 seconds, and, if more than 30 seconds have passed and your sanity has JUST dropped to 0, you will die instantly(configurable + you can disable death, but instead, some debuffs will become of a higher level))
 
 ### 2) Compatibility with Hbm's Nuclear Tech filters/masks/protective helmets
 
 ### 3) Updated build script, thanks to GTNH!
 
 ### 4) Fixed a bug where the sound of the gas mask was played even when the game was paused
 
+### 5) Added a bunch of configs
 
-## Current TODO:
+### 6) Completely rewritten biome temperature system
 
-- [x] implement death within a certain time when sanity = 0F
+### 7) Completely rewritte armor temperature system
 
-- [x] enviromine gas protection for  hbm filters/masks/protective helmets
-
-- [x] custom / needed in the modpack things
+### 8) Added compat with Hbm's NTM Space (fork)
 
 
 # Credits:

build.gradle

@@ -2,3 +2,5 @@
 plugins {
     id 'com.gtnewhorizons.gtnhconvention'
 }
+
+version = "1.3.142"

dependencies.gradle

@@ -36,7 +36,9 @@
 dependencies {
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
     runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
-    compileOnly name: 'HBM-NTM-[1.0.27_X4915]'
+    compileOnly name: 'HBM-NTM-.1.0.27_X5119_H261'
+	compileOnly name: 'SereneSeasons-1.7.10-1.3.1'
+
     compileOnly fileTree(dir: 'libs', include: '*.jar')
     compileOnly fileTree(dir: 'libs', include: '*.zip')
 }

src/main/java/enviromine/EntityPhysicsBlock.java

@@ -33,7 +33,7 @@
 
 public class EntityPhysicsBlock extends EntityFallingBlock implements IEntityAdditionalSpawnData
 {
-
+//я даже трогать это не собираюсь
 	public boolean isAnvil2 = true;
 	public boolean isBreakingAnvil2;
 	public int fallHurtMax2;

src/main/java/enviromine/EnviroDamageSource.java

@@ -10,7 +10,7 @@ public class EnviroDamageSource extends DamageSource
 {
 	public static EnviroDamageSource heatstroke = (EnviroDamageSource)(new EnviroDamageSource("heatstroke")).setDamageBypassesArmor();
 	public static EnviroDamageSource organfailure = (EnviroDamageSource)(new EnviroDamageSource("organfailure")).setDamageBypassesArmor();
-	public static EnviroDamageSource bleedout = (EnviroDamageSource)(new EnviroDamageSource("bleedout")).setDamageBypassesArmor();
+	//public static EnviroDamageSource bleedout = (EnviroDamageSource)(new EnviroDamageSource("bleedout")).setDamageBypassesArmor();
 	public static EnviroDamageSource suffocate = (EnviroDamageSource)(new EnviroDamageSource("suffocate")).setDamageBypassesArmor();
 	public static EnviroDamageSource frostbite = (EnviroDamageSource)(new EnviroDamageSource("frostbite")).setDamageBypassesArmor();
 	public static EnviroDamageSource dehydrate = (EnviroDamageSource)(new EnviroDamageSource("dehydrate")).setDamageBypassesArmor();

src/main/java/enviromine/client/gui/Gui_EventManager.java

@@ -222,32 +222,4 @@ public void onGuiRender(RenderGameOverlayEvent.Post event)
 		}
 
 	}
-
-	//TODO Was used for Debugging Gui
-	/*@SubscribeEvent
-	public void onGuiOpen(GuiOpenEvent event)
-	{
-		if(event == null) return;
-		if(event.gui == null) return;
-		System.out.println(event.gui.getClass().getSimpleName().toString());
-		if(event.gui instanceof GuiConfig)
-		{
-			GuiConfig guiConfig = (GuiConfig) event.gui;
-
-			System.out.println("configID:"+guiConfig.configID +" modID:"+ guiConfig.modID);
-
-			Iterator<IConfigElement> elements = guiConfig.configElements.iterator();
-
-			while(elements.hasNext())
-			{
-				IConfigElement element = elements.next();
-
-
-				System.out.println("element name:"+ element.getName() +" Type:"+ element.getType() + " QNamed:"+element.getQualifiedName());
-
-			}
-
-		}
-	}*/
-
 }

src/main/java/enviromine/client/gui/UI_Settings.java

@@ -23,11 +23,11 @@ public class UI_Settings {
 	public static int screenWidth;
 	public static int screenHeight;
 	public static boolean overlay = true;
-	
-	public static void writeToNBT(NBTTagCompound nbt) 
+
+	public static void writeToNBT(NBTTagCompound nbt)
 	{
-		
-    	nbt.setBoolean("ShowGuiIcons", ShowGuiIcons); 
+
+    	nbt.setBoolean("ShowGuiIcons", ShowGuiIcons);
     	nbt.setFloat("guiScale", guiScale);
     	nbt.setBoolean("sweatParticals", sweatParticals);
     	nbt.setBoolean("insaneParticals", insaneParticals);
@@ -37,17 +37,13 @@ public static void writeToNBT(NBTTagCompound nbt)
     	nbt.setBoolean("breathSound", breathSound);
     	nbt.setInteger("breathPause", breathPause);
     	nbt.setFloat("breathVolume", breathVolume);
-    	nbt.setBoolean("minimalHud",minimalHud); 
+    	nbt.setBoolean("minimalHud",minimalHud);
     	nbt.setBoolean("overlay", overlay);
-
-
-		// TODO Auto-generated method stub
-
 	}
-	
+
 	public static void readFromNBT(NBTTagCompound nbt)
 	{
-	
+
 		ShowGuiIcons = nbt.hasKey("ShowGuiIcons") ? nbt.getBoolean("ShowGuiIcons") : ShowGuiIcons;
 		guiScale = nbt.hasKey("guiScale") ? nbt.getFloat("guiScale") : guiScale;
 		sweatParticals = nbt.hasKey("sweatParticals") ? nbt.getBoolean("sweatParticals") : sweatParticals;
@@ -58,7 +54,7 @@ public static void readFromNBT(NBTTagCompound nbt)
 		breathSound = nbt.hasKey("breathSound") ? nbt.getBoolean("breathSound") : breathSound;
 		breathPause = nbt.hasKey("breathPause") ? nbt.getInteger("breathPause") : breathPause;
 		breathVolume = nbt.hasKey("breathVolume") ? nbt.getFloat("breathVolume") : breathVolume;
-		minimalHud = nbt.hasKey("minimalHud") ? nbt.getBoolean("minimalHud") : minimalHud; 
+		minimalHud = nbt.hasKey("minimalHud") ? nbt.getBoolean("minimalHud") : minimalHud;
 		overlay = nbt.hasKey("overlay") ? nbt.getBoolean("overlay") : overlay;
 	}
 }

src/main/java/enviromine/client/gui/UpdateNotification.java

@@ -27,25 +27,25 @@
 //	boolean hasChecked = false;
 //	public static String version;
 //	public static String lastSeen;
-//	
+//
 //	@SubscribeEvent
 //	public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event)
 //	{
 //		if(!EnviroMine.proxy.isClient() || hasChecked)
 //		{
 //			return;
 //		}
-//		
+//
 //		hasChecked = true;
-//		
+//
 //		loadConfigLog();
-//		
+//
 //		loadWordPress();
-//		
+//
 //		displayUpdateCheck(event);
-//		
+//
 //	}
-//	
+//
 //	/**
 //	 * This will get grab Enviromines Change Logs
 //	 */
@@ -55,12 +55,12 @@
 //			WordPressPost.changeLog = getUrl("https://drone.io/github.com/Funwayguy/EnviroMine-1.7/files/build/libs/full_changelog.txt", true);
 //
 //		} catch (IOException e) {
-//			// TODO Auto-generated catch block
+//			// TODO_ Auto-generated catch block
 //			EnviroMine.logger.log(Level.WARN, "Failed to get ChangeLog file!");
 //		}
 //
 //	}
-//	
+//
 //	/**
 //	 * This will grab Word Press Post Page and sent to parser
 //	 */
@@ -69,59 +69,59 @@
 //		try
 //		{
 //			String page = getUrl("https://enviromine.wordpress.com/news/feed/", true);
-//		
+//
 //			try {
 //				WordPressParser.main(page);
 //			} catch (Exception e) {
 //				EnviroMine.logger.log(Level.WARN, "Failed to parse WordPress News Page");
 //			}
-//			
-//			
+//
+//
 //		}catch(IOException e)
 //		{
 //			if(EM_Settings.updateCheck)
 //			{
 //				EnviroMine.logger.log(Level.WARN, "Failed to get WordPress News Page!");
 //			}
 //		}
-//		
+//
 //	}
-//	
+//
 //	@SuppressWarnings("unused")
 //	private void displayUpdateCheck(PlayerLoggedInEvent event)
 //	{
-//		
+//
 //		// File link: http://bit.ly/1r4JJt3;
 //		// DO NOT CHANGE THIS!
 //		if(EM_Settings.VERSION == "FWG_" + "EM" + "_VER")
 //		{
 //			event.player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "THIS COPY OF ENIVROMINE IS NOT FOR PUBLIC USE!"));
 //			return;
 //		}
-//		
+//
 //		try
 //		{
 //			String page = getUrl("http://bit.ly/1pwDr2o", true);
 //			String[] data = page.split("\\n");
-//			
+//
 //			String[] rawVer = data[0].trim().split("\\.");
 //			version = rawVer[0] + "." + rawVer[1] + "." + rawVer[2];
-//			
+//
 //			if(!EM_Settings.updateCheck)
 //			{
 //				return;
 //			}
-//			
+//
 //			//Debug stuff that shouldn't be printed to the user's chat window!
 //			/*for(int i = 0; i < data.length; i++)
 //			{
 //				event.player.addChatMessage(new ChatComponentText(EnumChatFormatting.RESET + "" + data[i].trim()));
 //			}*/
-//			
+//
 //			String http = data[0].trim();
-//			
+//
 //			int verStat = EnviroUtils.compareVersions(EM_Settings.VERSION, version);
-//			
+//
 //			if(verStat == -1)
 //			{
 //				event.player.addChatMessage(new ChatComponentTranslation("updatemsg.enviromine.available", version).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
@@ -148,7 +148,7 @@
 //			{
 //				event.player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("updatemsg.enviromine.error")));
 //			}
-//			
+//
 //		} catch(IOException e)
 //		{
 //			if(EM_Settings.updateCheck)
@@ -157,7 +157,7 @@
 //			}
 //		}
 //	}
-//	
+//
 //	/**
 //	 * Grabs http webpage and returns data
 //	 * @param link
@@ -173,7 +173,7 @@
 //		con.setDoOutput(false);
 //		con.setReadTimeout(20000);
 //		con.setRequestProperty("Connection", "keep-alive");
-//		
+//
 //		con.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20100101 Firefox/16.0");
 //		((HttpURLConnection)con).setRequestMethod("GET");
 //		con.setConnectTimeout(5000);
@@ -207,11 +207,11 @@
 //			buffer.append(g);
 //		}
 //		final String page = buffer.toString();
-//		
+//
 //		return page;
 //	}
 //
-//	
+//
 //	/**
 //	 *  This will update last seen post by player.
 //	 */
@@ -222,42 +222,42 @@
 //			lastSeen = WordPressPost.Posts.get(0).getPubDate();
 //		}
 //	}
-//	
+//
 //	/**
 //	 * This will compare last seen post with last post and return boolean
 //	 * @return
 //	 */
 //	public static boolean isNewPost()
 //	{
-//		if(lastSeen == null) return true; 
+//		if(lastSeen == null) return true;
 //
 //		 if(!WordPressPost.Posts.isEmpty())
 //		 {
 //			 WordPressPost lastPost = WordPressPost.Posts.get(0);
 //
-//		
+//
 //			 if(lastPost.getPubDate().toLowerCase().trim().equals(lastSeen.toLowerCase().trim()))
 //			 {
 //				 return false;
-//			 }		
+//			 }
 //		 }
 //		return true;
 //	}
-//	
+//
 //	public static void writeToNBT(NBTTagCompound nbt)
 //	{
 //		if(lastSeen != null)
 //		{
 //			nbt.setString("LastSeen", lastSeen);
 //		}
 //	}
-//	
+//
 //	public static void readFromNBT(NBTTagCompound nbt)
 //	{
 //		if(nbt.hasKey("LastSeen"))
 //		{
-//			lastSeen = nbt.getString("LastSeen");	
+//			lastSeen = nbt.getString("LastSeen");
 //		}
-//		 
+//
 //	}
 //}