Added Cobblestone Variants

Quizer9O8 · Jul 7, 2020 · ad9f1cd · ad9f1cd
1 parent 51e45c8
commit ad9f1cd
Show file tree

Hide file tree

Showing 482 changed files with 7,196 additions and 362 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,11 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
+<<<<<<< Updated upstream
 version = '1.15.2-1.0.2'
+=======
+version = '1.15.2-1.0.3'
+>>>>>>> Stashed changes
 group = 'com.quizer9o8.strata' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'strata'
 

diff --git a/src/main/java/com/quizer9o8/strata/Main.java → ...ain/java/com/quizer9o8/strata/Strata.java b/src/main/java/com/quizer9o8/strata/Main.java → ...ain/java/com/quizer9o8/strata/Strata.java
@@ -1,5 +1,9 @@
 package com.quizer9o8.strata;
 
+<<<<<<< Updated upstream:src/main/java/com/quizer9o8/strata/Main.java
+=======
+
+>>>>>>> Stashed changes:src/main/java/com/quizer9o8/strata/Strata.java
 import com.quizer9o8.strata.list.BlockList;
 import com.quizer9o8.strata.list.ItemList;
 import com.quizer9o8.strata.world.gen.StrataGeneration;
@@ -9,7 +13,10 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+<<<<<<< Updated upstream:src/main/java/com/quizer9o8/strata/Main.java
 import net.minecraftforge.fml.ModLoadingContext;
+=======
+>>>>>>> Stashed changes:src/main/java/com/quizer9o8/strata/Strata.java
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -20,27 +27,27 @@
 import org.apache.logging.log4j.Logger;
 
 // @Mod tells everything this is the main class.
-@Mod(Main.MOD_ID)
-@Mod.EventBusSubscriber(modid = Main.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class Main
+@Mod(Strata.MOD_ID)
+@Mod.EventBusSubscriber(modid = Strata.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class Strata
 {
     //This line below makes it possible to call upon this class from other places.
-    public static Main instance;
+    public static Strata instance;
 
     //Universal variables.
     public static final String MOD_ID = "strata";
 
     //Creative Tab
-    //public static final ItemGroup DEBUG_TAB = new Main.DebugItemGroup("debug");
-    public static final ItemGroup IGNEOUS_TAB = new Main.IgneousRocksItemGroup("igneous");
-    public static final ItemGroup METAMORPHIC_TAB = new Main.MetamorphicRocksItemGroup("metamorphic");
-    public static final ItemGroup SEDIMENTARY_TAB = new Main.SedimentaryRocksItemGroup("sedimentary");
-    //public static final ItemGroup MISCELLANEOUS_TAB = new Main.MiscellaneousRocksItemGroup("miscellaneous");
+    //public static final ItemGroup DEBUG_TAB = new Strata.DebugItemGroup("debug");
+    public static final ItemGroup IGNEOUS_TAB = new Strata.IgneousRocksItemGroup("igneous");
+    public static final ItemGroup METAMORPHIC_TAB = new Strata.MetamorphicRocksItemGroup("metamorphic");
+    public static final ItemGroup SEDIMENTARY_TAB = new Strata.SedimentaryRocksItemGroup("sedimentary");
+    //public static final ItemGroup MISCELLANEOUS_TAB = new Strata.MiscellaneousRocksItemGroup("miscellaneous");
 
     //Logger
     public static final Logger LOGGER = LogManager.getLogger();
 
-    public Main()
+    public Strata()
     {
         instance = this;
 
@@ -100,7 +107,7 @@ public IgneousRocksItemGroup(String name) {
 
         @Override
         public ItemStack createIcon(){
-            return new ItemStack(ItemList.GABBRO.get());
+            return new ItemStack(ItemList.BASALT.get());
         }
     }
 
@@ -126,7 +133,7 @@ public MetamorphicRocksItemGroup(String name) {
 
         @Override
         public ItemStack createIcon(){
-            return new ItemStack(ItemList.GNEISS.get());
+            return new ItemStack(ItemList.AMPHIBOLITE.get());
         }
     }
 /*

diff --git a/src/main/java/com/quizer9o8/strata/events/RegistryEvents.java b/src/main/java/com/quizer9o8/strata/events/RegistryEvents.java
@@ -1,33 +1,24 @@
 package com.quizer9o8.strata.events;
 
-import com.quizer9o8.strata.Main;
-import com.quizer9o8.strata.list.BlockList;
-import com.quizer9o8.strata.list.ItemList;
-import com.quizer9o8.strata.objects.blocks.StrataStairsBlock;
-import net.minecraft.block.*;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.Item;
+import com.quizer9o8.strata.Strata;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import org.apache.logging.log4j.Logger;
 
 //This tells the game to run this class before anything else.
 @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
 public class RegistryEvents
 {
-    public static final Logger LOGGER = Main.LOGGER;
-    public static final String MOD_ID = Main.MOD_ID;
+    public static final Logger LOGGER = Strata.LOGGER;
+    public static final String MOD_ID = Strata.MOD_ID;
 
     //ItemGroups
-    //public static final ItemGroup DEBUG = Main.DEBUG_TAB;
-    public static final ItemGroup IGNEOUS = Main.IGNEOUS_TAB;
-    public static final ItemGroup SEDIMENTARY = Main.SEDIMENTARY_TAB;
-    public static final ItemGroup METAMORPHIC = Main.METAMORPHIC_TAB;
-    //public static final ItemGroup MISCELLANEOUS = Main.MISCELLANEOUS_TAB;
+    //public static final ItemGroup DEBUG = Strata.DEBUG_TAB;
+    public static final ItemGroup IGNEOUS = Strata.IGNEOUS_TAB;
+    public static final ItemGroup SEDIMENTARY = Strata.SEDIMENTARY_TAB;
+    public static final ItemGroup METAMORPHIC = Strata.METAMORPHIC_TAB;
+    //public static final ItemGroup MISCELLANEOUS = Strata.MISCELLANEOUS_TAB;
 
     public static ResourceLocation location(String name)
     {