SidedProxy now has sensible default values - nested ClientProxy and ServerProxy classes.

This commit is contained in:
RainWarrior committed 2016-01-02 09:59:14 +03:00
1 parent 40a124d571
commit d105c444ee
9 files changed
+36 -13

No files matched your search

@@ -1,5 +1,7 @@
package net.minecraftforge.debug;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelBakery;
@@ -9,13 +11,16 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelDynBucket;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.debug.ModelFluidDebug.TestFluid;
import net.minecraftforge.debug.ModelFluidDebug.TestGas;
import net.minecraftforge.event.entity.player.FillBucketEvent;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
@@ -24,15 +29,13 @@ import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import java.util.List;
@Mod(modid = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidDebug.MODID)
public class DynBucketTest
{
public static final Item dynBucket = new DynBucket();
public static final Item dynBottle = new DynBottle();
@SidedProxy(clientSide = "net.minecraftforge.debug.DynBucketTest$ClientProxy", serverSide = "net.minecraftforge.debug.DynBucketTest$CommonProxy")
@SidedProxy
public static CommonProxy proxy;
public static class CommonProxy
@@ -42,6 +45,8 @@ public class DynBucketTest
}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
@Override
@@ -16,7 +16,7 @@ public class ItemLayerModelDebug
public static final String MODID = "ForgeDebugItemLayerModel";
public static final String VERSION = "1.0";
@SidedProxy(serverSide = "net.minecraftforge.debug.ItemLayerModelDebug$CommonProxy", clientSide = "net.minecraftforge.debug.ItemLayerModelDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
@EventHandler
@@ -30,6 +30,8 @@ public class ItemLayerModelDebug
}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation modelLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestItem.name, "inventory");
@@ -30,7 +30,7 @@ public class ItemTileDebug
private static String blockName = MODID.toLowerCase() + ":" + TestBlock.name;
@SidedProxy(serverSide = "net.minecraftforge.debug.ItemTileDebug$CommonProxy", clientSide = "net.minecraftforge.debug.ItemTileDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
@EventHandler
@@ -50,6 +50,8 @@ public class ItemTileDebug
public void init(FMLInitializationEvent event) {}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "inventory");
@@ -56,7 +56,7 @@ public class ModelAnimationDebug
public static final PropertyDirection FACING = PropertyDirection.create("facing");
public static final PropertyBool STATIC = PropertyBool.create("static");;
@SidedProxy(serverSide = "net.minecraftforge.debug.ModelAnimationDebug$CommonProxy", clientSide = "net.minecraftforge.debug.ModelAnimationDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
public static class CommonProxy
@@ -142,6 +142,8 @@ public class ModelAnimationDebug
public void init(FMLInitializationEvent event) {}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
@Override
@@ -66,7 +66,7 @@ public class ModelBakeEventDebug
}
}
@SidedProxy(serverSide = "net.minecraftforge.debug.ModelBakeEventDebug$CommonProxy", clientSide = "net.minecraftforge.debug.ModelBakeEventDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
@EventHandler
@@ -81,6 +81,8 @@ public class ModelBakeEventDebug
}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation blockLocation = new ModelResourceLocation(blockName, "normal");
@@ -26,7 +26,7 @@ public class ModelFluidDebug
public static final String MODID = "ForgeDebugModelFluid";
public static final String VERSION = "1.0";
@SidedProxy(serverSide = "net.minecraftforge.debug.ModelFluidDebug$CommonProxy", clientSide = "net.minecraftforge.debug.ModelFluidDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
public static final Fluid milkFluid = new Fluid("milk", new ResourceLocation("forge", "blocks/milk_still"), new ResourceLocation("forge", "blocks/milk_flow"));
@@ -47,6 +47,8 @@ public class ModelFluidDebug
}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "fluid");
@@ -21,7 +21,7 @@ public class MultiLayerModelDebug
public static String blockName = "test_layer_block";
@SidedProxy(serverSide = "net.minecraftforge.debug.MultiLayerModelDebug$CommonProxy", clientSide = "net.minecraftforge.debug.MultiLayerModelDebug$ClientProxy")
@SidedProxy
public static CommonProxy proxy;
public static class CommonProxy
@@ -50,6 +50,8 @@ public class MultiLayerModelDebug
}
}
public static class ServerProxy extends CommonProxy {}
public static class ClientProxy extends CommonProxy
{
@Override