Update semester information, disable non-overworld dimensions, and optimize and clean code

Author: MaidThatPrograms

.gitignore

@@ -1,4 +1,5 @@
 .*
+bin
 gradle
 run
 gradlew

README.md

@@ -4,4 +4,4 @@ This is the source code for the CMSC 389E Circuitry mod, created for UMD class C
 
 However, having this code available is not to be used to cheat or take advantage of. It is only here for academic purposes, debugging, and a means to effectively collaborate on this project.
 
-More information on the class and what you are expected to do can be found [here](https://cs.umd.edu/class/fall2020/cmsc389E).
+More information on the class and what you are expected to do can be found [here](https://cs.umd.edu/class/spring2021/cmsc389E).

build.gradle

@@ -1,67 +1,65 @@
 buildscript {
+	dependencies {
+		classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:+'
+	}
+
 	repositories {
 		maven {
 			url 'https://files.minecraftforge.net/maven'
 		}
-		
+
 		jcenter()
 	}
-	
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:+'
-	}
 }
 
-plugins {
-	id 'com.github.johnrengelman.shadow' version '4.0.4'
-}
+apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'net.minecraftforge.gradle'
 
 archivesBaseName = 'circuitry'
-group = 'cmsc389e.circuitry'
-version = '1.15.2-1.0.0.0'
+group = 'cmsc389e.' + archivesBaseName
+version = '1.15.2-1.1.0.0'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 compileJava.options.compilerArgs << '-proc:none'
 
 minecraft {
-	mappings channel: 'snapshot', version: '20200514-1.15.1'
-	
 	runs {
 		client {
-			workingDirectory project.file('run')
-			
 			mods {
 				circuitry.source sourceSets.main
 			}
+
+			workingDirectory project.file('run')
 		}
-		
+
 		server {
-			workingDirectory project.file('run')
-			
 			mods {
 				circuitry.source sourceSets.main
 			}
+
+			workingDirectory project.file('run')
 		}
 	}
-}
 
-dependencies {
-	minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
-	compile 'org.apache.httpcomponents:httpmime:4.3.3'
+	mappings channel: 'snapshot', version: '20200514-1.15.1'
 }
 
 reobf {
-	shadowJar {
-	}
+	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'))
 	}
-	
- 	classifier = ''
+
+	classifier = ''
 	manifest.attributes 'Implementation-Version': "${version}"
 	minimize()
 	relocate 'org.apache.http.entity.mime', project.group + '.org.apache.http.entity.mime'

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

@@ -27,22 +27,22 @@
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 
-@Mod(Circuitry.MODID)
 @EventBusSubscriber(bus = Bus.MOD)
+@Mod(Circuitry.MODID)
 public class Circuitry {
 	public static final String MODID = "circuitry";
 
 	private static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, MODID);
-	private static final DeferredRegister<TileEntityType<?>> TES = new DeferredRegister<>(ForgeRegistries.TILE_ENTITIES,
-			MODID);
+	private static final DeferredRegister<TileEntityType<?>> TYPES = new DeferredRegister<>(
+			ForgeRegistries.TILE_ENTITIES, MODID);
 
 	public static final RegistryObject<Block> IN_NODE = BLOCKS.register("in_node", InNodeBlock::new),
 			OUT_NODE = BLOCKS.register("out_node", OutNodeBlock::new);
-	public static final RegistryObject<TileEntityType<?>> NODE = TES.register("node",
+	public static final RegistryObject<TileEntityType<?>> NODE = TYPES.register("node",
 			() -> Builder.create(NodeTileEntity::new, IN_NODE.get(), OUT_NODE.get()).build(null));
 
-	@SuppressWarnings("resource")
 	@SubscribeEvent
+	@SuppressWarnings("resource")
 	public static void onClientSetup(FMLClientSetupEvent event) {
 		ObfuscationReflectionHelper.setPrivateValue(NewChatGui.class,
 				event.getMinecraftSupplier().get().ingameGUI.getChatGUI(), new ArrayList<ChatLine>() {
@@ -65,12 +65,12 @@ public int size() {
 
 	public Circuitry() {
 		DeferredRegister<Item> items = new DeferredRegister<>(ForgeRegistries.ITEMS, MODID);
-		BLOCKS.getEntries().forEach(block -> items.register(block.getId().getPath(),
+		BLOCKS.getEntries().parallelStream().forEach(block -> items.register(block.getId().getPath(),
 				() -> new BlockItem(block.get(), new Properties().group(ItemGroup.REDSTONE))));
 
 		IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
 		BLOCKS.register(bus);
-		TES.register(bus);
+		TYPES.register(bus);
 		items.register(bus);
 
 		Config.register();

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

@@ -28,8 +28,8 @@
 import net.minecraft.world.gen.FlatGenerationSettings;
 import net.minecraft.world.storage.WorldInfo;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.DrawHighlightEvent.HighlightBlock;
-import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
+import net.minecraftforge.client.event.DrawHighlightEvent;
+import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModList;
@@ -47,36 +47,36 @@ public class EventHandler {
 	private final static Minecraft MINECRAFT = Minecraft.getInstance();
 	private final static Field WORLD_SEED = ObfuscationReflectionHelper.findField(CreateWorldScreen.class,
 			"field_146329_I"); // worldSeed
-	private final static WorldSettings WORLD_SETTINGS = new WorldSettings(0, GameType.CREATIVE, false, false,
-			WorldType.FLAT)
-					.enableCommands()
-					.setGeneratorOptions(FlatGenerationSettings
-							.createFlatGeneratorFromString(
-									"minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;minecraft:desert")
-							.func_210834_a(JsonOps.INSTANCE).getValue());
+	private final static WorldSettings SETTINGS = new WorldSettings(0, GameType.CREATIVE, false, false, WorldType.FLAT)
+			.enableCommands()
+			.setGeneratorOptions(FlatGenerationSettings
+					.createFlatGeneratorFromString(
+							"minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;minecraft:desert")
+					.func_210834_a(JsonOps.INSTANCE).getValue());
 
-	private static void alert(String line1, String line2, String line3, String button, Consumer<OS> consumer) {
+	private static void alert(String msg1, String msg2, String msg3, String button, Consumer<OS> consumer) {
 		MINECRAFT
 				.displayGuiScreen(new AlertScreen(() -> consumer.accept(Util.getOSType()),
-						new StringTextComponent(line1).setStyle(new Style().setColor(TextFormatting.RED)),
-						new StringTextComponent(line2 + "\n\n").appendSibling(
-								new StringTextComponent(line3).setStyle(new Style().setColor(TextFormatting.AQUA))),
+						new StringTextComponent(msg1).setStyle(new Style().setColor(TextFormatting.RED)),
+						new StringTextComponent(msg2 + "\n\n").appendSibling(
+								new StringTextComponent(msg3).setStyle(new Style().setColor(TextFormatting.AQUA))),
 						button));
 	}
 
 	@SubscribeEvent
-	public static void onHighlightBlock(HighlightBlock event) {
-		TileEntity te = MINECRAFT.world.getTileEntity(event.getTarget().getPos());
+	public static void onDrawHighlightBlock(DrawHighlightEvent.HighlightBlock event) {
+		TileEntity entity = MINECRAFT.world.getTileEntity(event.getTarget().getPos());
 		MINECRAFT.ingameGUI.setOverlayMessage(
-				te != null && te.getType() == Circuitry.NODE.get() ? ((NodeTileEntity) te).getTag() : "", false);
+				entity != null && entity.getType() == Circuitry.NODE.get() ? ((NodeTileEntity) entity).getTag() : "",
+				false);
 	}
 
 	@SubscribeEvent
-	public static void onPostInitGui(InitGuiEvent.Post event) throws IllegalAccessException {
+	public static void onGuiScreenInitPost(GuiScreenEvent.InitGuiEvent.Post event) throws IllegalAccessException {
 		Screen screen = event.getGui();
 		if (screen instanceof CreateWorldScreen && WORLD_SEED.get(screen).equals(""))
 			((CreateWorldScreen) screen)
-					.recreateFromExistingWorld(new WorldInfo(WORLD_SETTINGS, I18n.format("selectWorld.newWorld")));
+					.recreateFromExistingWorld(new WorldInfo(SETTINGS, I18n.format("selectWorld.newWorld")));
 		else if (event.getGui() instanceof MainMenuScreen) {
 			ModList list = ModList.get();
 
@@ -88,11 +88,11 @@ else if (event.getGui() instanceof MainMenuScreen) {
 						Arrays.toString(mods), "fml.button.open.mods.folder",
 						os -> os.openFile(FMLPaths.MODSDIR.get().toFile()));
 
-			IModInfo info = list.getModContainerById(Circuitry.MODID).get().getModInfo();
-			if (!info.getVersion().getQualifier().equals("NONE")) {
-				CheckResult result = VersionChecker.getResult(info);
+			IModInfo mod = list.getModContainerById(Circuitry.MODID).get().getModInfo();
+			if (!mod.getVersion().getQualifier().equals("NONE")) {
+				CheckResult result = VersionChecker.getResult(mod);
 				if (result.status == Status.OUTDATED)
-					alert(info.getDisplayName() + " is out of date.",
+					alert(mod.getDisplayName() + " is out of date.",
 							"You must update to version " + result.target
 									+ " before proceeding.\nOpen Link will bring you to the below page:",
 							result.url, "Open Link", os -> os.openURI(result.url));

src/main/java/cmsc389e/circuitry/common/Config.java

@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
@@ -19,30 +20,26 @@ public class Config {
 
 	public static boolean loaded;
 	public static String[] inTags, outTags;
-	public static Boolean[][] inTests, outTests;
+	public static String[][] inTests, outTests;
 
 	public static void load() throws IOException {
-		loaded = false;
 		try (InputStream in = new URL("https://cs.umd.edu/~abrassel/proj" + projectNumber.get() + "tests.txt")
 				.openStream()) {
 			List<String> lines = IOUtils.readLines(in, (Charset) null);
 			String[] tags = lines.get(1).split("\t(?=o)", 2);
+
+			loaded = false;
 			inTags = tags[0].split("\t");
 			outTags = tags[1].split("\t");
-			inTests = new Boolean[lines.size() - 2][inTags.length];
-			outTests = new Boolean[inTests.length][outTags.length];
+			inTests = new String[lines.size() - 2][];
+			outTests = new String[inTests.length][];
 			for (int i = 0; i < inTests.length; i++) {
 				tags = lines.get(i + 2).split("\t");
-				for (int j = 0; j < tags.length; j++) {
-					Boolean value = tags[j].equals("1");
-					if (j < inTags.length)
-						inTests[i][j] = value;
-					else
-						outTests[i][j - inTags.length] = value;
-				}
+				inTests[i] = Arrays.copyOf(tags, inTags.length);
+				outTests[i] = Arrays.copyOfRange(tags, inTags.length, tags.length);
 			}
+			loaded = true;
 		}
-		loaded = true;
 	}
 
 	public static void register() {

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

@@ -10,25 +10,19 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.GameRules;
+import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.storage.WorldInfo;
-import net.minecraftforge.event.world.WorldEvent.CreateSpawnPosition;
+import net.minecraftforge.event.entity.EntityTravelToDimensionEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 
 @EventBusSubscriber
 public class EventHandler {
 	@SubscribeEvent
-	public static void onCreateSpawnPosition(CreateSpawnPosition event) {
-		WorldInfo info = event.getWorld().getWorldInfo();
-		info.setDayTime(6000);
-		info.setDifficulty(Difficulty.PEACEFUL);
-
-		GameRules rules = info.getGameRulesInstance();
-		rules.get(GameRules.DO_DAYLIGHT_CYCLE).set(false, null);
-		rules.get(GameRules.DO_MOB_SPAWNING).set(false, null);
-		rules.get(GameRules.DO_TILE_DROPS).set(false, null);
-		rules.get(GameRules.DO_WEATHER_CYCLE).set(false, null);
+	public static void onEntityTravelToDimension(EntityTravelToDimensionEvent event) {
+		event.setCanceled(true);
 	}
 
 	/**
@@ -38,7 +32,8 @@ public static void onCreateSpawnPosition(CreateSpawnPosition event) {
 	 * @param event the {@link FMLServerStartingEvent}
 	 */
 	@SubscribeEvent
-	public static void onServerStarting(FMLServerStartingEvent event) {
+	@SuppressWarnings("resource")
+	public static void onFMLServerStarting(FMLServerStartingEvent event) {
 		CommandDispatcher<CommandSource> dispatcher = event.getCommandDispatcher();
 		SetCommand.register(dispatcher);
 		TestCommand.register(dispatcher);
@@ -49,8 +44,20 @@ public static void onServerStarting(FMLServerStartingEvent event) {
 			e.printStackTrace();
 		}
 
-		@SuppressWarnings("resource")
 		MinecraftServer server = event.getServer();
-		server.registerTickable(Tester.INSTANCE = new Tester(server));
+		server.registerTickable(new Tester(server.getWorld(DimensionType.OVERWORLD)));
+	}
+
+	@SubscribeEvent
+	public static void onWorldCreateSpawnPosition(WorldEvent.CreateSpawnPosition event) {
+		WorldInfo info = event.getWorld().getWorldInfo();
+		info.setDayTime(6000);
+		info.setDifficulty(Difficulty.PEACEFUL);
+
+		GameRules rules = info.getGameRulesInstance();
+		rules.get(GameRules.DO_DAYLIGHT_CYCLE).set(false, null);
+		rules.get(GameRules.DO_MOB_SPAWNING).set(false, null);
+		rules.get(GameRules.DO_TILE_DROPS).set(false, null);
+		rules.get(GameRules.DO_WEATHER_CYCLE).set(false, null);
 	}
 }

src/main/java/cmsc389e/circuitry/common/NodeTileEntity.java

@@ -1,20 +1,19 @@
 package cmsc389e.circuitry.common;
 
-import java.util.function.Consumer;
-import java.util.stream.StreamSupport;
+import java.util.stream.Stream;
 
 import cmsc389e.circuitry.Circuitry;
+import net.minecraft.block.Block;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
+import net.minecraft.world.World;
 
 public class NodeTileEntity extends TileEntity {
-	public static void forEach(MinecraftServer server, Consumer<NodeTileEntity> action) {
+	public static Stream<NodeTileEntity> stream(World world) {
 		TileEntityType<?> type = Circuitry.NODE.get();
-		StreamSupport.stream(server.getWorlds().spliterator(), true)
-				.flatMap(world -> world.loadedTileEntityList.parallelStream()).filter(te -> te.getType() == type)
-				.map(te -> (NodeTileEntity) te).forEach(action);
+		return world.loadedTileEntityList.parallelStream().filter(entity -> entity.getType() == type)
+				.map(entity -> (NodeTileEntity) entity).sequential();
 	}
 
 	public int index;
@@ -23,6 +22,13 @@ public NodeTileEntity() {
 		super(Circuitry.NODE.get());
 	}
 
+	public NodeTileEntity(World world, Block block) {
+		this();
+		index = stream(world).filter(entity -> entity.getBlockState().getBlock() == block)
+				.mapToInt(entity -> entity.index).sorted().reduce(-1, (left, right) -> left + 1 < right ? left : right)
+				+ 1;
+	}
+
 	public String getTag() {
 		if (Config.loaded) {
 			String[] tags = getBlockState().getBlock() == Circuitry.IN_NODE.get() ? Config.inTags : Config.outTags;