etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switched to a lowercase mod id, fixed bucket textures

Browse source
This commit is contained in:
Adubbz 2016-11-17 12:28:49 +11:00
parent 4f802ca60c
commit 798e18708b
7 changed files with 102 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,4 +1,4 @@
minecraft_version=1.11 minecraft_version=1.11
forge_version=13.19.0.2129-1.11.x forge_version=13.19.0.2133
mod_version=6.0.0 mod_version=6.0.0
mappings_version=snapshot_nodoc_20161115 mappings_version=snapshot_nodoc_20161115

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,4 +1,4 @@
#Wed Nov 16 15:40:47 AEDT 2016 #Thu Nov 17 11:57:30 EST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
src/main/java/biomesoplenty/client/texture/ForgeRedirectedResourcePack.java
View file

@ -3,6 +3,7 @@ package biomesoplenty.client.texture;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import biomesoplenty.core.BiomesOPlenty;
import net.minecraft.client.resources.IResourcePack; import net.minecraft.client.resources.IResourcePack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.FMLClientHandler;
@ -18,7 +19,7 @@ public class ForgeRedirectedResourcePack extends FMLFileResourcePack
{ {
super(container); super(container);
this.bopResourcePack = (IResourcePack)FMLClientHandler.instance().getResourcePackFor("BiomesOPlenty"); this.bopResourcePack = (IResourcePack)FMLClientHandler.instance().getResourcePackFor(BiomesOPlenty.MOD_ID);
} }
@Override @Override

2
src/main/java/biomesoplenty/core/BiomesOPlenty.java
View file

@ -48,7 +48,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
public class BiomesOPlenty public class BiomesOPlenty
{ {
public static final String MOD_NAME = "Biomes O' Plenty"; public static final String MOD_NAME = "Biomes O' Plenty";
public static final String MOD_ID = "BiomesOPlenty"; public static final String MOD_ID = "biomesoplenty";
public static final String MOD_VERSION = "@MOD_VERSION@"; public static final String MOD_VERSION = "@MOD_VERSION@";
public static final String GUI_FACTORY = "biomesoplenty.client.gui.GuiFactory"; public static final String GUI_FACTORY = "biomesoplenty.client.gui.GuiFactory";

12
src/main/java/biomesoplenty/core/ClientProxy.java
View file

@ -55,6 +55,7 @@ import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.AbstractResourcePack; import net.minecraft.client.resources.AbstractResourcePack;
import net.minecraft.client.resources.IResourcePack; import net.minecraft.client.resources.IResourcePack;
import net.minecraft.client.resources.LegacyV2Adapter;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -265,25 +266,24 @@ public class ClientProxy extends CommonProxy
private static void replaceForgeResources() private static void replaceForgeResources()
{ {
//TODO: Implement models for our buckets if (MiscConfigurationHandler.overrideForgeBuckets)
if (ForgeModContainer.replaceVanillaBucketModel && MiscConfigurationHandler.overrideForgeBuckets)
{ {
FMLClientHandler clientHandler = FMLClientHandler.instance(); FMLClientHandler clientHandler = FMLClientHandler.instance();
List<IResourcePack> resourcePackList = ReflectionHelper.getPrivateValue(FMLClientHandler.class, clientHandler, "resourcePackList"); List<IResourcePack> resourcePackList = ReflectionHelper.getPrivateValue(FMLClientHandler.class, clientHandler, "resourcePackList");
Map<String, IResourcePack> resourcePackMap = ReflectionHelper.getPrivateValue(FMLClientHandler.class, clientHandler, "resourcePackMap"); Map<String, IResourcePack> resourcePackMap = ReflectionHelper.getPrivateValue(FMLClientHandler.class, clientHandler, "resourcePackMap");
AbstractResourcePack resourcePack = (AbstractResourcePack)clientHandler.getResourcePackFor("Forge"); LegacyV2Adapter resourcePack = (LegacyV2Adapter)clientHandler.getResourcePackFor("forge");
//Remove the old resource pack from the registry //Remove the old resource pack from the registry
resourcePackList.remove(resourcePack); resourcePackList.remove(resourcePack);
resourcePackMap.remove("Forge"); resourcePackMap.remove("forge");
//Replace Forge's resource pack with our modified version //Replace Forge's resource pack with our modified version
ForgeRedirectedResourcePack redirectedResourcePack = new ForgeRedirectedResourcePack(FMLCommonHandler.instance().findContainerFor("Forge")); ForgeRedirectedResourcePack redirectedResourcePack = new ForgeRedirectedResourcePack(FMLCommonHandler.instance().findContainerFor("forge"));
//Add our new resource pack in its place //Add our new resource pack in its place
resourcePackList.add(redirectedResourcePack); resourcePackList.add(redirectedResourcePack);
resourcePackMap.put("Forge", redirectedResourcePack); resourcePackMap.put("forge", redirectedResourcePack);
} }
} }

2
src/main/resources/mcmod.info
View file

@ -1,5 +1,5 @@
[{ [{
"modid": "BiomesOPlenty", "modid": "biomesoplenty",
"name": "Biomes O' Plenty", "name": "Biomes O' Plenty",
"description": "Adds over 50 new biomes, blocks, and more!", "description": "Adds over 50 new biomes, blocks, and more!",
"version": "${mod_version}", "version": "${mod_version}",