Merge pull request #1 from CMSC-389E/1.15.x

1.15.x

Author: MaidScientistIzutsumiMarin

.gitignore

@@ -1,11 +1,6 @@
-.gradle
-.settings
-bin
-doc
+.*
 gradle
 run
-.classpath
-.project
-*.launch
 gradlew
-gradlew.bat
+gradlew.bat
+*.launch

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Jamie
+Copyright (c) 2020 Jamie Brassel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

Node.psd

@@ -1,7 +1,7 @@
 # CMSC-389E-Circuitry
 
-This is the source code for the Circuitry mod, created for class <a href="https://www.cs.umd.edu/~abrassel/">CMSC 389E</a>. Every class is available to view, entirely unobfuscated. For the time being, it will be kept up-to-date with current commits.
+This is the source code for the CMSC 389E Circuitry mod, created for UMD class CMSC 389E. Every class is available to view, entirely unobfuscated. For the time being, it will be kept up-to-date with current commits.
 
 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 <a href="http://www.cs.umd.edu/class/spring2020/cmsc389E/">here</a>.
+More information on the class and what you are expected to do can be found <a href="https://cs.umd.edu/class/fall2020/cmsc389E">here</a>.

README.md

@@ -1,44 +1,59 @@
 buildscript {
-    repositories {
-        jcenter()
-        maven {
-			url = "http://files.minecraftforge.net/maven"
+	repositories {
+		maven {
+			url = 'https://files.minecraftforge.net/maven'
 		}
-    }
+		
+		jcenter()
+		mavenCentral()
+	}
 
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-    }
+	dependencies {
+		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '+', changing: true
+	}
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
-version = "1.12.2-1.0.1.0"
-group = "cmsc3893.circuitry"
-archivesBaseName = "circuitry"
-sourceCompatibility = targetCompatibility = '1.8'
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'eclipse'
+version = '1.15.2-1.0.0.0'
+group = 'cmsc389e.circuitry'
+archivesBaseName = 'circuitry'
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+compileJava.options.compilerArgs << '-proc:none'
 
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-    options.compilerArgs << '-parameters'
+minecraft {
+	mappings channel: 'snapshot', version: '20200514-1.15.1'
+	
+	runs {
+		client {
+			workingDirectory project.file('run')
+	
+			mods {
+				circuitry.source sourceSets.main
+			}
+		}
+		
+		server {
+			workingDirectory project.file('run')
+	
+			mods {
+				circuitry.source sourceSets.main
+			}
+		}
+	}
 }
 
-minecraft {
-    version = "1.12.2-14.23.5.2768"
-    runDir = "run"
-    mappings = "stable_39"
-	makeObfSourceJar = false
+dependencies {
+	minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
+	compile 'org.apache.httpcomponents:httpmime:+'
 }
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-	
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-	
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
+jar.manifest.attributes (
+	'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+	'Implementation-Title': project.name,
+	'Implementation-Vendor': project.archivesBaseName,
+	'Implementation-Version': "${version}",
+	'Specification-Title': project.name,
+	'Specification-Vendor': project.archivesBaseName,
+	'Specification-Version': "${version}"
+)

build.gradle

@@ -1,67 +1,78 @@
 package cmsc389e.circuitry;
 
-import cmsc389e.circuitry.common.IProxy;
-import cmsc389e.circuitry.common.command.CommandAbort;
-import cmsc389e.circuitry.common.command.CommandLoad;
-import cmsc389e.circuitry.common.command.CommandSet;
-import cmsc389e.circuitry.common.command.CommandTest;
-import cmsc389e.circuitry.common.network.CircuitryPacketHandler;
-import net.minecraft.command.ServerCommandManager;
+import java.util.ArrayList;
+
+import cmsc389e.circuitry.common.Config;
+import cmsc389e.circuitry.common.NodeTileEntity;
+import cmsc389e.circuitry.common.block.InNodeBlock;
+import cmsc389e.circuitry.common.block.OutNodeBlock;
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.ChatLine;
+import net.minecraft.client.gui.NewChatGui;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.Item.Properties;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.tileentity.TileEntityType;
+import net.minecraft.tileentity.TileEntityType.Builder;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
 
-/**
- * Mod class for CMSC 389E Circuitry.
- */
-@Mod(modid = Circuitry.MODID, version = "1.12.2-1.0.1.0", useMetadata = true, updateJSON = "https://raw.githubusercontent.com/JamieBrassel/CMSC-389E-Circuitry/master/update.json")
+@Mod(Circuitry.MODID)
+@EventBusSubscriber(bus = Bus.MOD)
 public class Circuitry {
     public static final String MODID = "circuitry";
-    @SidedProxy(clientSide = "cmsc389e.circuitry.client.ClientProxy", serverSide = "cmsc389e.circuitry.server.ServerProxy")
-    private static IProxy proxy;
 
-    /**
-     * Called while Minecraft Forge is initializing during mod startup.<br>
-     * Currently, this method calls {@link CircuitryPacketHandler#init()} and
-     * {@link IProxy#init(FMLInitializationEvent)}.
-     *
-     * @param event the {@link FMLInitializationEvent}
-     */
-    @EventHandler
-    public static void init(FMLInitializationEvent event) {
-	CircuitryPacketHandler.init();
-	proxy.init(event);
-    }
+    private static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, MODID);
+    private static final DeferredRegister<TileEntityType<?>> TES = 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",
+	    () -> Builder.create(NodeTileEntity::new, IN_NODE.get(), OUT_NODE.get()).build(null));
+
+    @SuppressWarnings("resource")
+    @SubscribeEvent
+    public static void onClientSetup(FMLClientSetupEvent event) {
+	ObfuscationReflectionHelper.setPrivateValue(NewChatGui.class,
+		event.getMinecraftSupplier().get().ingameGUI.getChatGUI(), new ArrayList<ChatLine>() {
+		    private boolean frozen;
 
-    /**
-     * Called while Minecraft Forge is post-initializing during mod startup.<br>
-     * Currently, this method just calls
-     * {@link IProxy#postInit(FMLPostInitializationEvent)}.
-     *
-     * @param event the {@link FMLPostInitializationEvent event}
-     */
-    @EventHandler
-    public static void postInit(FMLPostInitializationEvent event) {
-	proxy.postInit(event);
+		    @Override
+		    public ChatLine remove(int index) {
+			frozen = true;
+			return get(index);
+		    }
+
+		    @Override
+		    public int size() {
+			int size = frozen ? 0 : super.size();
+			frozen = false;
+			return size;
+		    }
+		}, "field_146253_i"); // drawnChatLines
     }
 
-    /**
-     * Called while the logical server is starting up, but before it is started.<br>
-     * Currently, this method registers {@link CommandAbort /abort},
-     * {@link CommandLoad /load}, {@link CommandSet /set}, and {@link CommandTest
-     * /test}.
-     *
-     * @param event the {@link FMLServerStartingEvent}
-     */
-    @EventHandler
-    public static void serverStart(FMLServerStartingEvent event) {
-	ServerCommandManager commandManager = (ServerCommandManager) event.getServer().getCommandManager();
-	commandManager.registerCommand(new CommandAbort());
-	commandManager.registerCommand(new CommandLoad());
-	commandManager.registerCommand(new CommandSet());
-	commandManager.registerCommand(new CommandTest());
+    public Circuitry() {
+	DeferredRegister<Item> items = new DeferredRegister<>(ForgeRegistries.ITEMS, MODID);
+	BLOCKS.getEntries().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);
+	items.register(bus);
+
+	Config.register();
     }
 }