Merge pull request #18 from GamingCrew69/1.16.4

Update to 1.16.4

Author: Quizer9O8

build.gradle

@@ -13,20 +13,21 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.15.2-1.2.0'
+version = '1.16.4-1.3.0'
 
 group = 'com.quizer9o8.strata' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'strata'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   Snapshot are built nightly.
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20201228-1.15.1'
+    mappings channel: 'snapshot', version: '20201028-1.16.3'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -75,7 +76,8 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
+            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
                 examplemod {
@@ -90,7 +92,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
+    minecraft 'net.minecraftforge:forge:1.16.4-35.1.37'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"
@@ -141,7 +143,7 @@ publishing {
     }
     repositories {
         maven {
-            url "https://example.com/"
+            url "file:///${project.projectDir}/mcmodsrepo"
         }
     }
 }

gradle.properties

@@ -1,4 +1,5 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ./gradlew

src/main/java/com/quizer9o8/strata/Strata.java

@@ -2,7 +2,6 @@
 
 import com.quizer9o8.strata.list.BlockList;
 import com.quizer9o8.strata.list.ItemList;
-import com.quizer9o8.strata.world.gen.StrataGeneration;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tags.BlockTags;
@@ -46,18 +45,12 @@ public Strata()
 
         final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
 
-        modEventBus.addListener(this::setup);
         modEventBus.addListener(this::clientSetup);
 
         BlockList.BLOCKS.register(modEventBus);
         ItemList.ITEMS.register(modEventBus);
     }
 
-    private void setup(final FMLCommonSetupEvent event)
-    {
-        StrataGeneration.generate();
-    }
-
     private void clientSetup(final FMLClientSetupEvent event)
     {
 
@@ -69,10 +62,10 @@ public void onServerStarting(FMLServerStartingEvent event)
     }
 
     //Should tell in the logs if the blocks are correctly being read into the tag or not for TerraForged
-    @SubscribeEvent
-    public static void started(FMLServerStartedEvent event) {
-        new BlockTags.Wrapper(new ResourceLocation("forge:wg_stone")).getAllElements().forEach(System.out::println);
-    }
+    //@SubscribeEvent
+    //public static void started(FMLServerStartedEvent event) {
+    //    new BlockTags.Wrapper(new ResourceLocation("reterraforged:rock")).getAllElements().forEach(System.out::println);
+    //}
 
     //Creative Tab Objects
 
@@ -100,7 +93,7 @@ public IgneousRocksItemGroup(String name) {
 
         @Override
         public ItemStack createIcon(){
-            return new ItemStack(ItemList.BASALT.get());
+            return new ItemStack(ItemList.DACITE.get());
         }
     }