Bump Forge version to latest and adjust annotation formatting

Author: MaidThatPrograms

build.gradle

@@ -1,18 +1,17 @@
 buildscript {
-	dependencies {
+    dependencies {
 		classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-		classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
-	}
-
-	repositories {
-		maven {
-			url 'https://files.minecraftforge.net/maven'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+    }
+	
+    repositories {
+        maven {
+			url = 'https://files.minecraftforge.net/maven'
 		}
-
-		jcenter()
-	}
+		
+        jcenter()
+    }
 }
-
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'net.minecraftforge.gradle'
 
@@ -21,38 +20,40 @@ group = 'cmsc389e.' + archivesBaseName
 version = '1.15.2-2.1.0.0'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+
+
+dependencies {
+	compile 'org.apache.httpcomponents:httpmime:4.3.3'
+    minecraft 'net.minecraftforge:forge:1.15.2-31.2.50'
+}
 
 minecraft {
-	runs {
-		client {
-			mods {
+    runs {
+        client {
+            mods {
 				circuitry.source sourceSets.main
 			}
 
 			workingDirectory project.file('run')
-		}
+        }
 
-		server {
-			mods {
+        server {
+            mods {
 				circuitry.source sourceSets.main
 			}
 
 			workingDirectory project.file('run')
-		}
-	}
-
-	mappings channel: 'snapshot', version: '20200514-1.15.1'
+        }
+    }
+	
+    mappings channel: 'snapshot', version: '20200514-1.15.1'
 }
 
 reobf {
 	shadowJar {}
 }
 
-dependencies {
-	compile 'org.apache.httpcomponents:httpmime:4.3.3'
-	minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
-}
-
 shadowJar {
 	dependencies {
 		include(dependency(':httpmime'))

src/main/java/cmsc389e/circuitry/Circuitry.java

@@ -69,8 +69,8 @@ public int size() {
 	}
 
 	@SubscribeEvent
-	@SuppressWarnings("resource")
 	public static void onDedicatedServerSetup(final FMLDedicatedServerSetupEvent event) {
+		@SuppressWarnings("resource")
 		final ServerProperties properties = event.getServerSupplier().get().getServerProperties();
 		final Properties serverProperties = ObfuscationReflectionHelper.getPrivateValue(PropertyManager.class,
 				properties, "field_73672_b"); // serverProperties
@@ -89,9 +89,9 @@ public static void onDedicatedServerSetup(final FMLDedicatedServerSetupEvent eve
 	public Circuitry() {
 		final Item.Properties properties = new Item.Properties().group(ItemGroup.REDSTONE);
 
-		final DeferredRegister<Block> blocks = new DeferredRegister<>(ForgeRegistries.BLOCKS, MODID);
-		final DeferredRegister<Item> items = new DeferredRegister<>(ForgeRegistries.ITEMS, MODID);
-		final DeferredRegister<TileEntityType<?>> types = new DeferredRegister<>(ForgeRegistries.TILE_ENTITIES, MODID);
+		final DeferredRegister<Block> blocks = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
+		final DeferredRegister<Item> items = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
+		final DeferredRegister<TileEntityType<?>> types = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, MODID);
 
 		inNode = blocks.register("in_node", InNodeBlock::new);
 		outNode = blocks.register("out_node", OutNodeBlock::new);

src/main/java/cmsc389e/circuitry/client/EventHandler.java

@@ -88,7 +88,7 @@ public static void onGuiOpenEvent(final GuiOpenEvent event) throws IllegalAccess
 						os -> os.openFile(FMLPaths.MODSDIR.get().toFile())));
 
 			final IModInfo mod = list.getModContainerById(Circuitry.MODID).get().getModInfo();
-			if (!mod.getVersion().getQualifier().equals("NONE")) {
+			if (!"NONE".equals(mod.getVersion().getQualifier())) {
 				final CheckResult result = VersionChecker.getResult(mod);
 				if (result.status == Status.OUTDATED)
 					event.setGui(alert(mod.getDisplayName() + " is out of date.",

src/main/java/cmsc389e/circuitry/common/block/InNodeBlock.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.IBlockReader;
 
 public final class InNodeBlock extends NodeBlock {
+	@Deprecated
 	@Override
 	public boolean canProvidePower(final BlockState state) {
 		return true;
@@ -22,6 +23,7 @@ public String getTranslationKey() {
 		return "In Node";
 	}
 
+	@Deprecated
 	@Override
 	public int getWeakPower(final BlockState blockState, final IBlockReader blockAccess, final BlockPos pos,
 			final Direction side) {

src/main/java/cmsc389e/circuitry/common/block/NodeBlock.java

@@ -44,6 +44,7 @@ public final void fillStateContainer(final Builder<Block, BlockState> builder) {
 		builder.add(POWERED);
 	}
 
+	@Deprecated
 	@Override
 	public final int getLightValue(final BlockState state) {
 		return isPowered(state) ? 15 : 0;
@@ -56,6 +57,7 @@ public final boolean hasTileEntity(final BlockState state) {
 		return true;
 	}
 
+	@Deprecated
 	@Override
 	public final ActionResultType onBlockActivated(final BlockState state, final World worldIn, final BlockPos pos,
 			final PlayerEntity player, final Hand handIn, final BlockRayTraceResult hit) {

src/main/java/cmsc389e/circuitry/common/block/OutNodeBlock.java

@@ -25,6 +25,7 @@ public String getTranslationKey() {
 		return "Out Node";
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(final BlockState state, final World worldIn, final BlockPos pos, final Block blockIn,
 			final BlockPos fromPos, final boolean isMoving) {