Added built-in classic textures resource pack (Not fully working yet), removed April Fools easter egg from the Rainbow Hills

src/main/java/biomesoplenty/client/BOPClassicPack.java

@@ -0,0 +1,141 @@
+/**Copied from Twilight Forest and modified with permission**/
+
+package biomesoplenty.client;
+
+import biomesoplenty.core.BiomesOPlenty;
+import com.google.common.base.Joiner;
+import net.minecraft.resources.ResourcePack;
+import net.minecraft.resources.ResourcePackFileNotFoundException;
+import net.minecraft.resources.ResourcePackType;
+import net.minecraft.resources.data.IMetadataSectionSerializer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.loading.moddiscovery.ModFile;
+
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@OnlyIn(Dist.CLIENT)
+public class BOPClassicPack extends ResourcePack
+{
+    private final ModFile modFile;
+    private static final String subDir = "classic/";
+
+    public BOPClassicPack(ModFile modFile)
+    {
+        super(modFile.getFilePath().toFile());
+        this.modFile = modFile;
+    }
+
+    @Override
+    public Set<String> getNamespaces(ResourcePackType type)
+    {
+        try
+        {
+            Path root = modFile.getLocator().findPath(modFile, subDir + type.getDirectory()).toAbsolutePath();
+            return Files.walk(root,1).map(path -> root.relativize(path.toAbsolutePath())).filter(path -> path.getNameCount() > 0).map(p->p.toString().replaceAll("/$","")).filter(s -> !s.isEmpty()).collect(Collectors.toSet());
+        }
+        catch (Throwable t)
+        {
+            BiomesOPlenty.logger.error("BOPClassicPack failed to collect resource namespaces!", t);
+            return Collections.emptySet();
+        }
+    }
+
+    @Override
+    protected InputStream getResource(String location) throws IOException
+    {
+        final Path path = modFile.getLocator().findPath(modFile, subDir + location);
+
+        if (!Files.exists(path))
+        {
+            BiomesOPlenty.logger.error("File does not exist!");
+            throw new ResourcePackFileNotFoundException(path.toFile(), location);
+        }
+
+        return Files.newInputStream(path, StandardOpenOption.READ);
+    }
+
+    @Override
+    protected boolean hasResource(String resourcePath)
+    {
+        return Files.exists(modFile.getLocator().findPath(modFile, subDir + resourcePath));
+    }
+
+    @Override
+    public Collection<ResourceLocation> getResources(ResourcePackType type, String namespaceIn, String pathIn, int maxDepthIn, Predicate<String> filterIn)
+    {
+        try
+        {
+            Path root = modFile.getLocator().findPath(modFile, subDir + type.getDirectory()).toAbsolutePath();
+            Path inputPath = root.getFileSystem().getPath(pathIn);
+
+            return Files.walk(root).map(path -> root.relativize(path.toAbsolutePath())).filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepthIn).filter(path -> !path.toString().endsWith(".mcmeta")).filter(path -> path.subpath(1, path.getNameCount()).startsWith(inputPath)).filter(path -> filterIn.test(path.getFileName().toString())).map(path -> new ResourceLocation(path.getName(0).toString(), Joiner.on('/').join(path.subpath(1, Math.min(maxDepthIn, path.getNameCount()))))).collect(Collectors.toList());
+        }
+        catch (IOException e)
+        {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public void close() { }
+
+    @Override
+    public String getName()
+    {
+        return "BOP Programmer Art";
+    }
+
+    @Nullable
+    @Override
+    public <T> T getMetadataSection(IMetadataSectionSerializer<T> serializer) throws IOException
+    {
+        InputStream inputStream = getResource("pack.mcmeta");
+        Throwable throwable = null;
+        T resourceMetaData;
+
+        try
+        {
+            resourceMetaData = getMetadataFromStream(serializer, inputStream);
+        }
+        catch (Throwable t)
+        {
+            throwable = t;
+            throw t;
+        }
+        finally
+        {
+            if (inputStream != null)
+            {
+                if (throwable != null)
+                {
+                    try
+                    {
+                        inputStream.close();
+                    }
+                    catch (Throwable t)
+                    {
+                        throwable.addSuppressed(t);
+                    }
+                }
+                else
+                {
+                    inputStream.close();
+                }
+            }
+        }
+
+        return resourceMetaData;
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/RainbowHillsBiome.java

@@ -88,16 +88,12 @@ public class RainbowHillsBiome extends BiomeTemplate
 
     public int getGrassColor(double x, double z)
     {
-        if (ClientProxy.isAprilFools) { return 0xFFFFFF; }
-
         double d0 = Biome.BIOME_INFO_NOISE.getValue(x * 0.0225D, z * 0.0225D, false);
         return d0 < -0.1D ? 0x77CE7F : 0x75CE8D;
     }
     
     public int getFoliageColor()
     {
-        if (ClientProxy.isAprilFools) { return 0xFFFFFF; }
-
         return 0x75CE8D;
     }
 }

src/main/java/biomesoplenty/core/BiomesOPlenty.java

@@ -8,9 +8,15 @@
 
 package biomesoplenty.core;
 
+import biomesoplenty.client.BOPClassicPack;
 import biomesoplenty.client.renderer.BoatRendererBOP;
 import biomesoplenty.init.*;
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.ResourcePackInfo;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;

src/main/java/biomesoplenty/core/ClientProxy.java

@@ -8,25 +8,27 @@
 package biomesoplenty.core;
 
 import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.client.BOPClassicPack;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.color.BlockColors;
 import net.minecraft.client.renderer.color.ItemColors;
 import net.minecraft.item.BlockItem;
+import net.minecraft.resources.ResourcePackInfo;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.FoliageColors;
 import net.minecraft.world.GrassColors;
 import net.minecraft.world.IBlockDisplayReader;
 import net.minecraft.world.biome.BiomeColors;
+import net.minecraftforge.fml.ModList;
 
 import java.awt.*;
 import java.util.Calendar;
 
 public class ClientProxy extends CommonProxy
 {
-    public static boolean isAprilFools = false;
-
     public ClientProxy()
     {
 
@@ -35,8 +37,7 @@ public class ClientProxy extends CommonProxy
     @Override
     public void init()
     {
-        Calendar calendar = Calendar.getInstance();
-        if (calendar.get(2) + 1 == 4 && calendar.get(5) == 1) { isAprilFools = true; }
+        addClassicPack();
 
         BlockColors blockColors = Minecraft.getInstance().getBlockColors();
         ItemColors itemColors = Minecraft.getInstance().getItemColors();
@@ -65,10 +66,15 @@ public class ClientProxy extends CommonProxy
         	BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.willow_vine);
     }
 
+    public static void addClassicPack()
+    {
+        if (Minecraft.getInstance() == null) { return; }
+        Minecraft.getInstance().getResourcePackRepository().addPackFinder((consumer, iFactory) -> consumer.accept(ResourcePackInfo.create(new ResourceLocation(BiomesOPlenty.MOD_ID, "classic_textures").toString(), false, () -> new BOPClassicPack(ModList.get().getModFileById(BiomesOPlenty.MOD_ID).getFile()), iFactory, ResourcePackInfo.Priority.TOP, iTextComponent -> iTextComponent)));
+    }
+
     public static int getRainbowBirchColor(IBlockDisplayReader world, BlockPos pos)
     {
         Color foliage = Color.getHSBColor((((float)pos.getX() + MathHelper.sin(((float)pos.getZ() + (float)pos.getX()) / 35) * 35) % 150) / 150, 0.6F, 1.0F);
-        if (isAprilFools) { foliage = Color.WHITE; }
 
         return foliage.getRGB();
     }

src/main/resources/assets/biomesoplenty/lang/en_us.json

@@ -413,9 +413,5 @@
   "block.biomesoplenty.yellow_autumn_leaves": "Yellow Autumn Leaves",
   "block.biomesoplenty.yellow_autumn_sapling": "Yellow Autumn Sapling",
 
-  "argument.biomesoplenty.biome.invalid": "Invalid biome argument",
-  "commands.biomesoplenty.tpbiome.success": "Teleported %s to biome %s at (%s, %s, %s)",
-  "commands.biomesoplenty.tpbiome.error": "Couldn't find biome %s!",
-
   "entity.biomesoplenty.boat_bop": "Boat"
 }