Fixed Bugs and version 1.3.12

Arrokoth486958 · Dec 22, 2022 · 9d6f87f · 9d6f87f
1 parent a6f714d
commit 9d6f87f
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.3.1"
+version = "1.3.12"
 group = "mod.sol" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "sol"
 

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerMercury.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerMercury.java
@@ -66,7 +66,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerNeptune.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerNeptune.java
@@ -53,7 +53,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerPluto.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerPluto.java
@@ -53,7 +53,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerSaturn.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerSaturn.java
@@ -67,7 +67,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerSedna.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerSedna.java
@@ -53,7 +53,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/blocks/BlockBossSpawnerUranus.java b/src/main/java/mod/sol/blocks/BlockBossSpawnerUranus.java
@@ -52,7 +52,6 @@ public void registerModels()
 	}
 
     @Override
-	@javax.annotation.Nullable
 	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
 		return NULL_AABB;
 	}

diff --git a/src/main/java/mod/sol/util/handler/RegistryHandler.java b/src/main/java/mod/sol/util/handler/RegistryHandler.java
@@ -17,8 +17,6 @@
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 @EventBusSubscriber
 public class RegistryHandler 
@@ -38,7 +36,7 @@ public static void onBlockRegister(RegistryEvent.Register<Block> event)
 	}
 
 	@SubscribeEvent
-	@SideOnly(Side.CLIENT)
+//	@SideOnly(Side.CLIENT)
 	public static void onBlockMeshRegister(RegistryEvent.Register<Block> event)
 	{
 		RenderHandler.registerCustomMeshesAndStates();

diff --git a/src/main/java/mod/sol/util/handler/RenderHandler.java b/src/main/java/mod/sol/util/handler/RenderHandler.java
@@ -12,13 +12,7 @@
 
 public class RenderHandler {
 	public static void registerCustomMeshesAndStates() {
-		ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(SolBlocks.METHANE_FLUID_BLOCK), new ItemMeshDefinition() {
-
-			@Override
-			public ModelResourceLocation getModelLocation(ItemStack stack) {
-				return new ModelResourceLocation("sol:liquid_methane", "fluid");
-			}
-		});
+		ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(SolBlocks.METHANE_FLUID_BLOCK), stack -> new ModelResourceLocation("sol:liquid_methane", "fluid"));
 
 		ModelLoader.setCustomStateMapper(SolBlocks.METHANE_FLUID_BLOCK, new StateMapperBase() {
 

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -2,12 +2,12 @@
 {
   "modid": "sol",
   "name": "The Sol",
-  "description": "This mod is a Galacticraft Addon, which added a lot of celestialbodies for Galacticraft Solar system",
-  "version": "1.3.0",
+  "description": "This mod is a Galacticraft Addon, which added a lot of celestialbodies for Galacticraft Solar system\n©2021-2023 Arrokoth486958/Arrokoth233\nRepublishing without permission is prohibited.\nThis Mod ONLY publish on MCMOD百科(mcmod.cn), Github(github.com) and Curseforge(curseforge.com)",
+  "version": "1.3.12",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",
-  "authorList": ["Arrokoth_486958"],
+  "authorList": ["Arrokoth486958/Arrokoth233"],
   "credits": "Thanks a loooooot of guys who give me help",
   "logoFile": "",
   "screenshots": [],

diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
@@ -2,6 +2,6 @@
     "pack": {
         "description": "The Sol",
         "pack_format": 3,
-        "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
+        "_comment": "©2021-2023 Arrokoth486958/Arrokoth233\nRepublishing without permission is prohibited.\nThis Mod ONLY publish on MCMOD百科(mcmod.cn), Github(github.com) and Curseforge(curseforge.com)"
     }
 }