Move ISkinDownloadCallback, make grass paths a full block for now

Remove unneeded leftover field for it being configurable.
Roadhog360 · Sep 6, 2023 · def65b8 · def65b8
1 parent 4024ee4
commit def65b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/...t/skins/client/ISkinDownloadCallback.java → ...rum/api/client/ISkinDownloadCallback.java b/...t/skins/client/ISkinDownloadCallback.java → ...rum/api/client/ISkinDownloadCallback.java
@@ -1,7 +1,6 @@
-package ganymedes01.etfuturum.client.skins.client;
+package ganymedes01.etfuturum.api.client;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.resources.SkinManager.SkinAvailableCallback;

diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockGrassPath.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockGrassPath.java
@@ -3,7 +3,6 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ganymedes01.etfuturum.EtFuturum;
-import ganymedes01.etfuturum.configuration.configs.ConfigWorld;
 import ganymedes01.etfuturum.core.utils.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFarmland;
@@ -43,16 +42,7 @@ public BlockGrassPath() {
  */
  public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
  {
- return AxisAlignedBB.getBoundingBox((double)p_149668_2_ + this.minX, (double)p_149668_3_ + this.minY, (double)p_149668_4_ + this.minZ, (double)p_149668_2_ + this.maxX, (double)p_149668_3_ + (ConfigWorld.fullGrassPath ? 1 : this.maxY), (double)p_149668_4_ + this.maxZ);
- }
-
- /**
- * Returns the bounding box of the wired rectangular prism to render.
- */
- @SideOnly(Side.CLIENT)
- public AxisAlignedBB getSelectedBoundingBoxFromPool(World p_149633_1_, int p_149633_2_, int p_149633_3_, int p_149633_4_)
- {
- return getCollisionBoundingBoxFromPool(p_149633_1_, p_149633_2_, p_149633_3_, p_149633_4_);
+ return AxisAlignedBB.getBoundingBox((double) p_149668_2_ + this.minX, (double) p_149668_3_ + this.minY, (double) p_149668_4_ + this.minZ, (double) p_149668_2_ + this.maxX, (double) p_149668_3_ + 1, (double) p_149668_4_ + this.maxZ);
  }
 
  @Override

diff --git a/src/main/java/ganymedes01/etfuturum/client/skins/NewSkinManager.java b/src/main/java/ganymedes01/etfuturum/client/skins/NewSkinManager.java
@@ -1,22 +1,21 @@
 package ganymedes01.etfuturum.client.skins;
 
-import java.awt.image.BufferedImage;
-import java.io.File;
-
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ganymedes01.etfuturum.client.skins.client.ISkinDownloadCallback;
+import ganymedes01.etfuturum.api.client.ISkinDownloadCallback;
 import ganymedes01.etfuturum.lib.Reference;
 import net.minecraft.client.renderer.IImageBuffer;
 import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.util.ResourceLocation;
 
+import java.awt.image.BufferedImage;
+import java.io.File;
+
 /**
  * Stolen from 1.8 and modified to work with 1.7.10
  */

diff --git a/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigWorld.java b/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigWorld.java
@@ -27,7 +27,6 @@ public class ConfigWorld extends ConfigBase {
  public static int maxNetherGoldPerCluster;
  public static int maxMagmaPerCluster;
  public static int maxCopperPerCluster;
- public static boolean fullGrassPath;
  public static int deepslateGenerationMode;
  public static int maxDeepslatePerCluster;
  public static int deepslateMaxY;