mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
Change how Forge itself is located to be loaded similar to a real mod.
Fixes Minecraft/Forge annotation data missing. Fix Capability injection.
This commit is contained in:
1 parent
d11a67499d
commit
4879b0611a
18 files changed
+304
-349
No files matched your search
@@ -28,7 +28,6 @@ import org.lwjgl.opengl.GL11;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.GLAllocation;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
@@ -43,8 +42,7 @@ import net.minecraft.resources.IResourceManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
import net.minecraftforge.common.ForgeModContainer;
|
||||
import net.minecraftforge.common.ForgeConfig;
|
||||
import net.minecraftforge.resource.IResourceType;
|
||||
import net.minecraftforge.resource.ISelectiveResourceReloadListener;
|
||||
import net.minecraftforge.resource.VanillaResourceType;
|
||||
@@ -272,7 +270,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener
|
||||
|
||||
public void checkSettings()
|
||||
{
|
||||
boolean newEnabled = ForgeMod.forgeCloudsEnabled
|
||||
boolean newEnabled = ForgeConfig.CLIENT.forgeCloudsEnabled()
|
||||
&& mc.gameSettings.shouldRenderClouds() != 0
|
||||
&& mc.world != null
|
||||
&& mc.world.dimension.isSurfaceWorld();
|
||||
|
||||
@@ -23,7 +23,6 @@ import net.minecraftforge.client.event.ColorHandlerEvent;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
import net.minecraftforge.common.ForgeModContainer;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
||||
@@ -35,7 +34,7 @@ public class ForgeClientHandler
|
||||
// register model for the universal bucket, if it exists
|
||||
if (FluidRegistry.isUniversalBucketEnabled())
|
||||
{
|
||||
// TODO no more mesh definitions, this should be implemented with overrides
|
||||
// TODO no more mesh definitions, this should be implemented with overrides
|
||||
// ModelLoader.setBucketModelDefinition(ForgeMod.getInstance().universalBucket);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user