diff --git a/src/main/java/openblocks/Config.java b/src/main/java/openblocks/Config.java index b2773039..bc3ed6c4 100644 --- a/src/main/java/openblocks/Config.java +++ b/src/main/java/openblocks/Config.java @@ -333,10 +333,10 @@ public class Config { // There is no fail checking here because if the Generic item fails, // then I doubt anyone wants this to be silent. // Too many items would suffer from this. - NC - MetasGeneric.registerItems(); + OpenBlocks.Items.generic.registerItems(MetasGeneric.values()); OpenBlocks.Items.generic.initRecipes(); - MetasGenericUnstackable.registerItems(); + OpenBlocks.Items.genericUnstackable.registerItems(MetasGenericUnstackable.values()); OpenBlocks.Items.genericUnstackable.initRecipes(); if (OpenBlocks.Blocks.ladder != null) { @@ -670,7 +670,7 @@ public class Config { } if (OpenBlocks.Items.filledBucket != null) { - MetasBucket.registerItems(); + OpenBlocks.Items.filledBucket.registerItems(MetasBucket.values()); MetasBucket.xpbucket.registerAsBucketFor(OpenBlocks.Fluids.xpJuice); } diff --git a/src/main/java/openblocks/OpenBlocks.java b/src/main/java/openblocks/OpenBlocks.java index 88013778..c8a0fcf5 100644 --- a/src/main/java/openblocks/OpenBlocks.java +++ b/src/main/java/openblocks/OpenBlocks.java @@ -212,7 +212,7 @@ public class OpenBlocks { @RegisterItem(name = "hangglider") public static ItemHangGlider hangGlider; - @RegisterItem(name = "generic", isConfigurable = false) + @RegisterItem(name = "generic", isConfigurable = false, registerDefaultModel = false) public static ItemOBGeneric generic; @RegisterItem(name = "luggage") @@ -242,7 +242,7 @@ public class OpenBlocks { @RegisterItem(name = "slimalyzer") public static ItemSlimalyzer slimalyzer; - @RegisterItem(name = "filledbucket") + @RegisterItem(name = "filledbucket", registerDefaultModel = false) public static ItemFilledBucket filledBucket; @RegisterItem(name = "sleepingBag", unlocalizedName = "sleepingbag") @@ -251,7 +251,7 @@ public class OpenBlocks { @RegisterItem(name = "paintBrush", unlocalizedName = "paintbrush") public static ItemPaintBrush paintBrush; - @RegisterItem(name = "stencil") + @RegisterItem(name = "stencil", registerDefaultModel = false) public static ItemStencil stencil; @RegisterItem(name = "squeegee") @@ -272,7 +272,7 @@ public class OpenBlocks { @RegisterItem(name = "goldenEye", unlocalizedName = "golden_eye") public static ItemGoldenEye goldenEye; - @RegisterItem(name = "genericUnstackable", isConfigurable = false) + @RegisterItem(name = "genericUnstackable", isConfigurable = false, registerDefaultModel = false) public static ItemOBGenericUnstackable genericUnstackable; @RegisterItem(name = "cursor") @@ -497,6 +497,8 @@ public class OpenBlocks { proxy.init(); proxy.registerRenderInformation(); registerOreDictionary(); + + startupHelper.init(); } @EventHandler diff --git a/src/main/java/openblocks/common/item/ItemCartographer.java b/src/main/java/openblocks/common/item/ItemCartographer.java index 63558c43..cdd18fb0 100644 --- a/src/main/java/openblocks/common/item/ItemCartographer.java +++ b/src/main/java/openblocks/common/item/ItemCartographer.java @@ -24,11 +24,9 @@ public class ItemCartographer extends Item { }; public final String untranslatedName; - public final String iconName; private AssistantType(String name, String iconName) { this.untranslatedName = "openblocks.assistant_" + name; - this.iconName = "openblocks:assistant_" + iconName; } public abstract EntityAssistant createAssistant(World world, EntityPlayer owner, ItemStack stack); diff --git a/src/main/java/openblocks/common/item/ItemImaginationGlasses.java b/src/main/java/openblocks/common/item/ItemImaginationGlasses.java index 8a17bbd5..d42f5627 100644 --- a/src/main/java/openblocks/common/item/ItemImaginationGlasses.java +++ b/src/main/java/openblocks/common/item/ItemImaginationGlasses.java @@ -110,11 +110,10 @@ public class ItemImaginationGlasses extends ItemArmor { } }; - public final String iconName; + public final String textureName; private Type(String name) { - this.iconName = "openblocks:glasses_" + name; this.textureName = "openblocks:textures/models/glasses_" + name + ".png"; } diff --git a/src/main/java/openblocks/common/item/MetasBucket.java b/src/main/java/openblocks/common/item/MetasBucket.java index fe9fcd95..2f5c3aec 100644 --- a/src/main/java/openblocks/common/item/MetasBucket.java +++ b/src/main/java/openblocks/common/item/MetasBucket.java @@ -5,10 +5,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import openblocks.OpenBlocks; -import openblocks.OpenBlocks.Items; import openmods.item.IMetaItem; +import openmods.item.IMetaItemFactory; -public enum MetasBucket { +public enum MetasBucket implements IMetaItemFactory { xpbucket { @Override public IMetaItem createMetaItem() { @@ -28,12 +28,16 @@ public enum MetasBucket { return (stack.getItem() instanceof ItemFilledBucket) && (stack.getItemDamage() == ordinal()); } - protected abstract IMetaItem createMetaItem(); - - protected boolean isEnabled() { + @Override + public boolean isEnabled() { return true; } + @Override + public int getMeta() { + return ordinal(); + } + public void registerAsBucketFor(Fluid fluid) { registerAsContainerFor(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME), FluidContainerRegistry.EMPTY_BUCKET); } @@ -41,11 +45,4 @@ public enum MetasBucket { public void registerAsContainerFor(FluidStack fluid, ItemStack emptyContainer) { FluidContainerRegistry.registerFluidContainer(fluid.copy(), newItemStack(), emptyContainer); } - - public static void registerItems() { - for (MetasBucket m : values()) - if (m.isEnabled()) { - Items.filledBucket.registerItem(m.ordinal(), m.createMetaItem()); - } - } } \ No newline at end of file diff --git a/src/main/java/openblocks/common/item/MetasGeneric.java b/src/main/java/openblocks/common/item/MetasGeneric.java index 05e94f7e..9ccb992e 100644 --- a/src/main/java/openblocks/common/item/MetasGeneric.java +++ b/src/main/java/openblocks/common/item/MetasGeneric.java @@ -9,10 +9,11 @@ import openblocks.Config; import openblocks.OpenBlocks; import openmods.infobook.ICustomBookEntryProvider; import openmods.item.IMetaItem; +import openmods.item.IMetaItemFactory; import com.google.common.collect.ImmutableList; -public enum MetasGeneric { +public enum MetasGeneric implements IMetaItemFactory { gliderWing { @Override public IMetaItem createMetaItem() { @@ -151,15 +152,14 @@ public enum MetasGeneric { return (stack.getItem() instanceof ItemOBGeneric) && (stack.getItemDamage() == ordinal()); } - protected abstract IMetaItem createMetaItem(); - - protected boolean isEnabled() { + @Override + public boolean isEnabled() { return true; } - public static void registerItems() { - for (MetasGeneric m : values()) - if (m.isEnabled()) OpenBlocks.Items.generic.registerItem(m.ordinal(), m.createMetaItem()); + @Override + public int getMeta() { + return ordinal(); } public static class DocProvider implements ICustomBookEntryProvider { diff --git a/src/main/java/openblocks/common/item/MetasGenericUnstackable.java b/src/main/java/openblocks/common/item/MetasGenericUnstackable.java index 0f80cdce..29a3dffe 100644 --- a/src/main/java/openblocks/common/item/MetasGenericUnstackable.java +++ b/src/main/java/openblocks/common/item/MetasGenericUnstackable.java @@ -4,14 +4,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import openblocks.OpenBlocks; -import openblocks.OpenBlocks.Items; import openmods.colors.ColorMeta; import openmods.item.IMetaItem; +import openmods.item.IMetaItemFactory; -public enum MetasGenericUnstackable { +public enum MetasGenericUnstackable implements IMetaItemFactory { pointer { @Override - protected IMetaItem createMetaItem() { + public IMetaItem createMetaItem() { ItemStack result = newItemStack(); final ItemStack whiteWool = ColorMeta.WHITE.createStack(Blocks.wool, 1); return new MetaPointer("pointer", new ShapedOreRecipe(result, "w ", "ww ", "w ", 'w', whiteWool)); @@ -29,14 +29,14 @@ public enum MetasGenericUnstackable { return (stack.getItem() == OpenBlocks.Items.genericUnstackable) && (stack.getItemDamage() == ordinal()); } - protected abstract IMetaItem createMetaItem(); - - protected boolean isEnabled() { + @Override + public boolean isEnabled() { return true; } - public static void registerItems() { - for (MetasGenericUnstackable m : values()) - if (m.isEnabled()) Items.genericUnstackable.registerItem(m.ordinal(), m.createMetaItem()); + @Override + public int getMeta() { + return ordinal(); } + } \ No newline at end of file diff --git a/src/main/resources/assets/openblocks/models/item/assistant_base.json b/src/main/resources/assets/openblocks/models/item/assistant_base.json new file mode 100644 index 00000000..fa56ac53 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/assistant_base.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/assistant_base" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/balloon.json b/src/main/resources/assets/openblocks/models/item/balloon.json new file mode 100644 index 00000000..91c9588b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/balloon.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_balloon" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/beam.json b/src/main/resources/assets/openblocks/models/item/beam.json new file mode 100644 index 00000000..fc3cb21b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/beam.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/beam" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/border.json b/src/main/resources/assets/openblocks/models/item/border.json new file mode 100644 index 00000000..040b05e9 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/border.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_border" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/cartographer.json b/src/main/resources/assets/openblocks/models/item/cartographer.json new file mode 100644 index 00000000..fbe99f22 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/cartographer.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/assistant_cartographer" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/corner.json b/src/main/resources/assets/openblocks/models/item/corner.json new file mode 100644 index 00000000..de030a6f --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/corner.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_corner" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/corner2.json b/src/main/resources/assets/openblocks/models/item/corner2.json new file mode 100644 index 00000000..366f56b1 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/corner2.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_corner2" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/corner3.json b/src/main/resources/assets/openblocks/models/item/corner3.json new file mode 100644 index 00000000..59a2b834 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/corner3.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_corner3" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/craneBackpack.json b/src/main/resources/assets/openblocks/models/item/craneBackpack.json new file mode 100644 index 00000000..12812435 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/craneBackpack.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/crane_backpack" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/crane_engine.json b/src/main/resources/assets/openblocks/models/item/crane_engine.json new file mode 100644 index 00000000..ce92f1f9 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/crane_engine.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/crane_engine" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/crane_magnet.json b/src/main/resources/assets/openblocks/models/item/crane_magnet.json new file mode 100644 index 00000000..001abf3f --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/crane_magnet.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/crane_magnet" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/creeperface.json b/src/main/resources/assets/openblocks/models/item/creeperface.json new file mode 100644 index 00000000..a2f40990 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/creeperface.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_creeperface" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/cursor.json b/src/main/resources/assets/openblocks/models/item/cursor.json new file mode 100644 index 00000000..0d4307d1 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/cursor.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/cursor" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/emptyMap.json b/src/main/resources/assets/openblocks/models/item/emptyMap.json new file mode 100644 index 00000000..716803e1 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/emptyMap.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/empty_map" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/epicEraser.json b/src/main/resources/assets/openblocks/models/item/epicEraser.json new file mode 100644 index 00000000..932eb8c7 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/epicEraser.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/epic_eraser" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/gliderwing.json b/src/main/resources/assets/openblocks/models/item/gliderwing.json new file mode 100644 index 00000000..0e84f00e --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/gliderwing.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/gliderwing" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/goldenEye.json b/src/main/resources/assets/openblocks/models/item/goldenEye.json new file mode 100644 index 00000000..66ae6df7 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/goldenEye.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/golden_eye" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/heart.json b/src/main/resources/assets/openblocks/models/item/heart.json new file mode 100644 index 00000000..44cdfa8b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/heart.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_heart" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/heart2.json b/src/main/resources/assets/openblocks/models/item/heart2.json new file mode 100644 index 00000000..175ac42b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/heart2.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_heart2" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/heightMap.json b/src/main/resources/assets/openblocks/models/item/heightMap.json new file mode 100644 index 00000000..b97b8c99 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/heightMap.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/height_map" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/hole.json b/src/main/resources/assets/openblocks/models/item/hole.json new file mode 100644 index 00000000..83edbb90 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/hole.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_hole" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/infoBook.json b/src/main/resources/assets/openblocks/models/item/infoBook.json new file mode 100644 index 00000000..9915e0b1 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/infoBook.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/info_book" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/line.json b/src/main/resources/assets/openblocks/models/item/line.json new file mode 100644 index 00000000..d0b04933 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/line.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/line" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/map_controller.json b/src/main/resources/assets/openblocks/models/item/map_controller.json new file mode 100644 index 00000000..50c7a1fe --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/map_controller.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/map_controller" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/map_memory.json b/src/main/resources/assets/openblocks/models/item/map_memory.json new file mode 100644 index 00000000..f2adbd56 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/map_memory.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/map_memory" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/miracle_magnet.json b/src/main/resources/assets/openblocks/models/item/miracle_magnet.json new file mode 100644 index 00000000..4787013f --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/miracle_magnet.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/miracle_magnet" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/pencilGlasses.json b/src/main/resources/assets/openblocks/models/item/pencilGlasses.json new file mode 100644 index 00000000..c3516bd8 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/pencilGlasses.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/glasses_pencil" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/pointer.json b/src/main/resources/assets/openblocks/models/item/pointer.json new file mode 100644 index 00000000..22d2775b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/pointer.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/pointer" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/seriousGlasses.json b/src/main/resources/assets/openblocks/models/item/seriousGlasses.json new file mode 100644 index 00000000..04a99317 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/seriousGlasses.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/glasses_admin" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/sketching_pencil.json b/src/main/resources/assets/openblocks/models/item/sketching_pencil.json new file mode 100644 index 00000000..60d1aae0 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/sketching_pencil.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/sketching_pencil" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/sleepingBag.json b/src/main/resources/assets/openblocks/models/item/sleepingBag.json new file mode 100644 index 00000000..6523695e --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/sleepingBag.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/sleepingbag" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/sonicglasses.json b/src/main/resources/assets/openblocks/models/item/sonicglasses.json new file mode 100644 index 00000000..3fa4f767 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/sonicglasses.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/sonicglasses" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/spiral.json b/src/main/resources/assets/openblocks/models/item/spiral.json new file mode 100644 index 00000000..f310dce8 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/spiral.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_spiral" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/splat.json b/src/main/resources/assets/openblocks/models/item/splat.json new file mode 100644 index 00000000..009b188e --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/splat.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_splat" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/spongeonastick.json b/src/main/resources/assets/openblocks/models/item/spongeonastick.json new file mode 100644 index 00000000..04e2bff7 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/spongeonastick.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/spongeonastick" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/squeegee.json b/src/main/resources/assets/openblocks/models/item/squeegee.json new file mode 100644 index 00000000..122ce2be --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/squeegee.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/squeegee" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/storage.json b/src/main/resources/assets/openblocks/models/item/storage.json new file mode 100644 index 00000000..54563850 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/storage.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_storage" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/stripes.json b/src/main/resources/assets/openblocks/models/item/stripes.json new file mode 100644 index 00000000..49362a6e --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/stripes.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_stripes" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/tastyClay.json b/src/main/resources/assets/openblocks/models/item/tastyClay.json new file mode 100644 index 00000000..dcc99d1b --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/tastyClay.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/yum_yum" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/technicolorGlasses.json b/src/main/resources/assets/openblocks/models/item/technicolorGlasses.json new file mode 100644 index 00000000..9dec694f --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/technicolorGlasses.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/glasses_technicolor" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/thickstripes.json b/src/main/resources/assets/openblocks/models/item/thickstripes.json new file mode 100644 index 00000000..a0d50eec --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/thickstripes.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:blocks/stencilcover_thickstripes" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/unprepared_stencil.json b/src/main/resources/assets/openblocks/models/item/unprepared_stencil.json new file mode 100644 index 00000000..39d39184 --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/unprepared_stencil.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/unprepared_stencil" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/wrench.json b/src/main/resources/assets/openblocks/models/item/wrench.json new file mode 100644 index 00000000..71e6a20f --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/wrench.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/wrench" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/openblocks/models/item/xpbucket.json b/src/main/resources/assets/openblocks/models/item/xpbucket.json new file mode 100644 index 00000000..3eef03de --- /dev/null +++ b/src/main/resources/assets/openblocks/models/item/xpbucket.json @@ -0,0 +1,18 @@ +{ + "parent" : "builtin/generated", + "textures" : { + "layer0" : "openblocks:items/xpbucket" + }, + "display" : { + "thirdperson" : { + "rotation" : [ -90, 0, 0 ], + "translation" : [ 0, 1, -3 ], + "scale" : [ 0.55, 0.55, 0.55 ] + }, + "firstperson" : { + "rotation" : [ 0, -135, 25 ], + "translation" : [ 0, 4, 2 ], + "scale" : [ 1.7, 1.7, 1.7 ] + } + } +}