mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Initial 1.11 release update.
This commit is contained in:
1 parent
4e6a774075
commit
c459b87ec9
34 files changed
+849
-69
No files matched your search
@@ -58,7 +58,7 @@ public class ItemLayerModelDebug
|
||||
public static final class TestItem extends Item
|
||||
{
|
||||
public static final TestItem instance = new TestItem();
|
||||
public static final String name = "TestItem";
|
||||
public static final String name = "test_item";
|
||||
|
||||
private TestItem()
|
||||
{
|
||||
|
||||
@@ -162,7 +162,7 @@ public class ModelFluidDebug
|
||||
public static final class TestFluidBlock extends BlockFluidClassic
|
||||
{
|
||||
public static final TestFluidBlock instance = new TestFluidBlock();
|
||||
public static final String name = "TestFluidBlock";
|
||||
public static final String name = "test_fluid_block";
|
||||
|
||||
private TestFluidBlock()
|
||||
{
|
||||
@@ -176,7 +176,7 @@ public class ModelFluidDebug
|
||||
public static final class MilkFluidBlock extends BlockFluidClassic
|
||||
{
|
||||
public static final MilkFluidBlock instance = new MilkFluidBlock();
|
||||
public static final String name = "MilkFluidBlock";
|
||||
public static final String name = "milk_fluid_block";
|
||||
|
||||
private MilkFluidBlock()
|
||||
{
|
||||
@@ -190,7 +190,7 @@ public class ModelFluidDebug
|
||||
public static final class TestGasBlock extends BlockFluidClassic
|
||||
{
|
||||
public static final TestGasBlock instance = new TestGasBlock();
|
||||
public static final String name = "TestGasBlock";
|
||||
public static final String name = "test_gas_block";
|
||||
|
||||
private TestGasBlock()
|
||||
{
|
||||
|
||||
@@ -120,7 +120,7 @@ public class ModelLoaderRegistryDebug
|
||||
{
|
||||
public static final PropertyDirection FACING = PropertyDirection.create("facing");
|
||||
public static final CustomModelBlock instance = new CustomModelBlock();
|
||||
public static final String name = "CustomModelBlock";
|
||||
public static final String name = "custom_model_block";
|
||||
private int counter = 1;
|
||||
|
||||
private CustomModelBlock()
|
||||
@@ -221,7 +221,7 @@ public class ModelLoaderRegistryDebug
|
||||
public static class OBJTesseractBlock extends Block implements ITileEntityProvider
|
||||
{
|
||||
public static final OBJTesseractBlock instance = new OBJTesseractBlock();
|
||||
public static final String name = "OBJTesseractBlock";
|
||||
public static final String name = "obj_tesseract_block";
|
||||
|
||||
private OBJTesseractBlock()
|
||||
{
|
||||
@@ -364,7 +364,7 @@ public class ModelLoaderRegistryDebug
|
||||
public static class OBJVertexColoring1 extends Block
|
||||
{
|
||||
public static final OBJVertexColoring1 instance = new OBJVertexColoring1();
|
||||
public static final String name = "OBJVertexColoring1";
|
||||
public static final String name = "obj_vertex_coloring1";
|
||||
|
||||
private OBJVertexColoring1()
|
||||
{
|
||||
@@ -396,7 +396,7 @@ public class ModelLoaderRegistryDebug
|
||||
{
|
||||
public static final PropertyDirection FACING = PropertyDirection.create("facing");
|
||||
public static final OBJDirectionEye instance = new OBJDirectionEye();
|
||||
public static final String name = "OBJDirectionEye";
|
||||
public static final String name = "obj_direction_eye";
|
||||
|
||||
private OBJDirectionEye()
|
||||
{
|
||||
@@ -471,7 +471,7 @@ public class ModelLoaderRegistryDebug
|
||||
public static class OBJVertexColoring2 extends Block implements ITileEntityProvider
|
||||
{
|
||||
public static final OBJVertexColoring2 instance = new OBJVertexColoring2();
|
||||
public static final String name = "OBJVertexColoring2";
|
||||
public static final String name = "obj_vertex_coloring2";
|
||||
|
||||
private OBJVertexColoring2()
|
||||
{
|
||||
@@ -573,7 +573,7 @@ public class ModelLoaderRegistryDebug
|
||||
{
|
||||
public static final PropertyDirection FACING = PropertyDirection.create("facing");
|
||||
public static final OBJDirectionBlock instance = new OBJDirectionBlock();
|
||||
public static final String name = "OBJDirectionBlock";
|
||||
public static final String name = "obj_direction_block";
|
||||
|
||||
private OBJDirectionBlock()
|
||||
{
|
||||
@@ -651,7 +651,7 @@ public class ModelLoaderRegistryDebug
|
||||
public static final PropertyBool WEST = PropertyBool.create("west");
|
||||
public static final PropertyBool EAST = PropertyBool.create("east");
|
||||
public static final OBJCustomDataBlock instance = new OBJCustomDataBlock();
|
||||
public static final String name = "OBJCustomDataBlock";
|
||||
public static final String name = "obj_custom_data_block";
|
||||
|
||||
private OBJCustomDataBlock()
|
||||
{
|
||||
@@ -708,7 +708,7 @@ public class ModelLoaderRegistryDebug
|
||||
public static class OBJDynamicEye extends Block implements ITileEntityProvider
|
||||
{
|
||||
public static final OBJDynamicEye instance = new OBJDynamicEye();
|
||||
public static final String name = "OBJDynamicEye";
|
||||
public static final String name = "obj_dynamic_eye";
|
||||
private OBJDynamicEye()
|
||||
{
|
||||
super(Material.IRON);
|
||||
|
||||
@@ -24,15 +24,15 @@ public class ObjectHolderTest
|
||||
//verifies @ObjectHolder with custom id
|
||||
assert VanillaObjectHolder.uiButtonClick != null;
|
||||
//verifies modded items work
|
||||
assert ForgeObjectHolder.forgePotion != null;
|
||||
assert ForgeObjectHolder.forge_potion != null;
|
||||
//verifies minecraft:air is now resolvable
|
||||
assert VanillaObjectHolder.air != null;
|
||||
//verifies unexpected name should not have defaulted to AIR.
|
||||
assert VanillaObjectHolder.nonExistentBlock == null;
|
||||
//verifies custom registries
|
||||
assert CustomRegistryObjectHolder.customEntry != null;
|
||||
assert CustomRegistryObjectHolder.custom_entry != null;
|
||||
//verifies interfaces are supported
|
||||
assert CustomRegistryObjectHolder.customEntryByInterface != null;
|
||||
assert CustomRegistryObjectHolder.custom_entry_by_interface != null;
|
||||
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ public class ObjectHolderTest
|
||||
public static void newRegistry(RegistryEvent.NewRegistry event) {
|
||||
new RegistryBuilder()
|
||||
.setType(ICustomRegistryEntry.class)
|
||||
.setName(new ResourceLocation("ObjectHolderTestCustomRegistry"))
|
||||
.setName(new ResourceLocation("object_holder_test_custom_registry"))
|
||||
.setIDRange(0, 255)
|
||||
.create();
|
||||
}
|
||||
@@ -58,18 +58,18 @@ public class ObjectHolderTest
|
||||
@SubscribeEvent
|
||||
public static void registerPotions(RegistryEvent.Register<Potion> event) {
|
||||
event.getRegistry().register(
|
||||
new ObjectHolderTest.PotionForge(new ResourceLocation(ObjectHolderTest.MODID, "forgePotion"), false, 0xff00ff) // test automatic id distribution
|
||||
new ObjectHolderTest.PotionForge(new ResourceLocation(ObjectHolderTest.MODID, "forge_potion"), false, 0xff00ff) // test automatic id distribution
|
||||
);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerInterfaceRegistryForge(RegistryEvent.Register<ICustomRegistryEntry> event) {
|
||||
event.getRegistry().register(
|
||||
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "customEntryByInterface"))
|
||||
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry_by_interface"))
|
||||
);
|
||||
|
||||
event.getRegistry().register(
|
||||
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "customEntry"))
|
||||
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry"))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -117,15 +117,15 @@ class VanillaObjectHolder
|
||||
class ForgeObjectHolder
|
||||
{
|
||||
//Tests using subclasses for injections
|
||||
public static final ObjectHolderTest.PotionForge forgePotion = null;
|
||||
public static final ObjectHolderTest.PotionForge forge_potion = null;
|
||||
}
|
||||
|
||||
@GameRegistry.ObjectHolder(ObjectHolderTest.MODID)
|
||||
class CustomRegistryObjectHolder
|
||||
{
|
||||
//Tests whether custom registries can be used
|
||||
public static final ICustomRegistryEntry customEntry = null;
|
||||
public static final ICustomRegistryEntry custom_entry = null;
|
||||
|
||||
//Tests whether interfaces can be used
|
||||
public static final ICustomRegistryEntry customEntryByInterface = null;
|
||||
public static final ICustomRegistryEntry custom_entry_by_interface = null;
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import net.minecraftforge.server.permission.context.ContextKey;
|
||||
@Mod(modid = PermissionTest.MOD_ID, name = "PermissionTest", version = "1.0.0")
|
||||
public class PermissionTest
|
||||
{
|
||||
public static final String MOD_ID = "PermissionTest";
|
||||
public static final String MOD_ID = "permission_test";
|
||||
|
||||
@Mod.Instance(PermissionTest.MOD_ID)
|
||||
public static PermissionTest inst;
|
||||
@@ -174,4 +174,4 @@ public class PermissionTest
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -109,7 +109,7 @@ public class TestCapabilityMod
|
||||
}
|
||||
|
||||
//Attach it! The resource location MUST be unique it's recomneded that you tag it with your modid and what the cap is.
|
||||
event.addCapability(new ResourceLocation("TestCapabilityMod:DummyCap"), new Provider(event.getTileEntity()));
|
||||
event.addCapability(new ResourceLocation("forge.testcapmod:dummy_cap"), new Provider(event.getTileEntity()));
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
@@ -157,4 +157,4 @@ public class TestCapabilityMod
|
||||
return "Default Implementation!";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ public class WRNormalMod
|
||||
@EventHandler
|
||||
public void init(FMLPreInitializationEvent event)
|
||||
{
|
||||
EntityRegistry.registerModEntity(EntityScaleTest.class, "ScaleTest", 0, instance, 60, 3, true);
|
||||
EntityRegistry.registerModEntity(EntityScaleTest.class, "scale_test", 0, instance, 60, 3, true);
|
||||
proxy.registerRenders();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user