Merge pull request #224 from SquidDev-CC/feature/lowercase-models

Lower case most resource names

src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java

@@ -20,8 +20,8 @@ import java.util.Arrays;
 
 public class FixedWidthFontRenderer
 {
-    public static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/termFont.png" );
-    public static ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/termBackground.png" );
+    public static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
+    public static ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
 
     public static int FONT_HEIGHT = 9;
     public static int FONT_WIDTH = 6;

src/main/java/dan200/computercraft/client/gui/GuiComputer.java

@@ -25,8 +25,8 @@ import java.io.IOException;
 public class GuiComputer extends GuiContainer
 {
     private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/corners.png" );
-    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/corners2.png" );
-    private static final ResourceLocation backgroundCommand = new ResourceLocation( "computercraft", "textures/gui/cornersCommand.png" );
+    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/corners_advanced.png" );
+    private static final ResourceLocation backgroundCommand = new ResourceLocation( "computercraft", "textures/gui/corners_command.png" );
 
     private final ComputerFamily m_family;
     private final IComputer m_computer;

src/main/java/dan200/computercraft/client/gui/GuiTurtle.java

@@ -28,7 +28,7 @@ import java.io.IOException;
 public class GuiTurtle extends GuiContainer
 {
     private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
-    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/turtle2.png" );
+    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
     
     protected World m_world;
     protected ContainerTurtle m_container;

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -26,7 +26,7 @@ import java.util.ArrayList;
 
 public class WidgetTerminal extends Widget
 {
-    private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/termBackground.png" );
+    private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
     private static float TERMINATE_TIME = 0.5f;
 
     private final IComputerContainer m_computer;

src/main/java/dan200/computercraft/client/proxy/CCTurtleProxyClient.java

@@ -32,6 +32,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -42,16 +43,12 @@ import javax.annotation.Nonnull;
 
 public class CCTurtleProxyClient extends CCTurtleProxyCommon
 {
-    public CCTurtleProxyClient()
-    {
-    }
-    
     // IComputerCraftProxy implementation
     
     @Override        
-    public void init()
+    public void preInit()
     {    
-        super.init();
+        super.preInit();
 
         // Register item models
         ItemMeshDefinition turtleMeshDefinition = new ItemMeshDefinition()
@@ -67,7 +64,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         };
         String[] turtleModelNames = new String[] {
             "turtle_dynamic",
-            "CC-Turtle", "CC-TurtleAdvanced",
+            "turtle", "turtle_advanced",
             "turtle_white",
             "turtle_elf_overlay"
         };
@@ -75,6 +72,15 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         registerItemModel( ComputerCraft.Blocks.turtleExpanded, turtleMeshDefinition, turtleModelNames );
         registerItemModel( ComputerCraft.Blocks.turtleAdvanced, turtleMeshDefinition, turtleModelNames );
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @Override
+    public void init()
+    {
+        super.init();
+
         // Setup turtle colours
         Minecraft.getMinecraft().getItemColors().registerItemColorHandler(
             new TurtleItemColour(),
@@ -83,9 +89,6 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
 
         // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     private void registerItemModel( Block block, ItemMeshDefinition definition, String[] names )
@@ -101,7 +104,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
             resources[i] = new ResourceLocation( "computercraft:" + names[i] );
         }
         ModelBakery.registerItemVariants( item, resources );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, definition );
+        ModelLoader.setCustomMeshDefinition( item, definition );
     }
 
     private void registerForgeHandlers()
@@ -137,7 +140,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         @SubscribeEvent
         public void onTextureStitchEvent( TextureStitchEvent.Pre event )
         {
-            event.getMap().registerSprite( new ResourceLocation( "computercraft", "blocks/craftyUpgrade" ) );
+            event.getMap().registerSprite( new ResourceLocation( "computercraft", "blocks/crafty_upgrade" ) );
         }
 
         @SubscribeEvent

src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java

@@ -46,6 +46,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -65,27 +67,19 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     private long m_renderFrame;
     private FixedWidthFontRenderer m_fixedWidthFontRenderer;
 
-    public ComputerCraftProxyClient()
-    {
-    }
-
     // IComputerCraftProxy implementation
 
     @Override
-    public void init()
+    public void preInit()
     {
-        super.init();
+        super.preInit();
         m_tick = 0;
         m_renderFrame = 0;
 
-        // Load textures
-        Minecraft mc = Minecraft.getMinecraft();
-        m_fixedWidthFontRenderer = new FixedWidthFontRenderer( mc.getTextureManager() );
-
         // Register item models
         registerItemModel( ComputerCraft.Blocks.computer, new ItemMeshDefinition()
         {
-            private ModelResourceLocation computer = new ModelResourceLocation( "computercraft:CC-Computer", "inventory" );
+            private ModelResourceLocation computer = new ModelResourceLocation( "computercraft:computer", "inventory" );
             private ModelResourceLocation advanced_computer = new ModelResourceLocation( "computercraft:advanced_computer", "inventory" );
 
             @Nonnull
@@ -96,26 +90,26 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
                 ComputerFamily family = itemComputer.getFamily( stack.getItemDamage() );
                 return ( family == ComputerFamily.Advanced ) ? advanced_computer : computer;
             }
-        }, new String[]{ "CC-Computer", "advanced_computer" } );
-        registerItemModel( ComputerCraft.Blocks.peripheral, 0, "CC-Peripheral" );
+        }, new String[]{ "computer", "advanced_computer" } );
+        registerItemModel( ComputerCraft.Blocks.peripheral, 0, "peripheral" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 1, "wireless_modem" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 2, "monitor" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 3, "printer" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 4, "advanced_monitor" );
-        registerItemModel( ComputerCraft.Blocks.cable, 0, "CC-Cable" );
+        registerItemModel( ComputerCraft.Blocks.cable, 0, "cable" );
         registerItemModel( ComputerCraft.Blocks.cable, 1, "wired_modem" );
         registerItemModel( ComputerCraft.Blocks.commandComputer, "command_computer" );
         registerItemModel( ComputerCraft.Blocks.advancedModem, "advanced_modem" );
 
         registerItemModel( ComputerCraft.Items.disk, "disk" );
-        registerItemModel( ComputerCraft.Items.diskExpanded, "diskExpanded" );
-        registerItemModel( ComputerCraft.Items.treasureDisk, "treasureDisk" );
+        registerItemModel( ComputerCraft.Items.diskExpanded, "disk_expanded" );
+        registerItemModel( ComputerCraft.Items.treasureDisk, "treasure_disk" );
         registerItemModel( ComputerCraft.Items.printout, 0, "printout" );
         registerItemModel( ComputerCraft.Items.printout, 1, "pages" );
         registerItemModel( ComputerCraft.Items.printout, 2, "book" );
         registerItemModel( ComputerCraft.Items.pocketComputer, new ItemMeshDefinition()
         {
-            private ModelResourceLocation pocket_computer_off = new ModelResourceLocation( "computercraft:pocketComputer", "inventory" );
+            private ModelResourceLocation pocket_computer_off = new ModelResourceLocation( "computercraft:pocket_computer", "inventory" );
             private ModelResourceLocation pocket_computer_on = new ModelResourceLocation( "computercraft:pocket_computer_on", "inventory" );
             private ModelResourceLocation pocket_computer_blinking = new ModelResourceLocation( "computercraft:pocket_computer_blinking", "inventory" );
             private ModelResourceLocation advanced_pocket_computer_off = new ModelResourceLocation( "computercraft:advanced_pocket_computer_off", "inventory" );
@@ -171,10 +165,23 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
                 }
             }
         }, new String[] {
-            "pocketComputer", "pocket_computer_on", "pocket_computer_blinking",
+            "pocket_computer", "pocket_computer_on", "pocket_computer_blinking",
             "advanced_pocket_computer_off", "advanced_pocket_computer_on", "advanced_pocket_computer_blinking",
         } );
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @Override
+    public void init()
+    {
+        super.init();
+
+        // Load textures
+        Minecraft mc = Minecraft.getMinecraft();
+        m_fixedWidthFontRenderer = new FixedWidthFontRenderer( mc.getTextureManager() );
+
         // Setup
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.disk ), ComputerCraft.Items.disk );
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.diskExpanded ), ComputerCraft.Items.diskExpanded );
@@ -193,9 +200,6 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
 
         // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileMonitor.class, new TileEntityMonitorRenderer() );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     private void registerItemModel( Block block, int damage, String name )
@@ -207,7 +211,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     {
         ModelResourceLocation res = new ModelResourceLocation( "computercraft:" + name, "inventory" );
         ModelBakery.registerItemVariants( item, new ResourceLocation( "computercraft", name ) );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, damage, res );
+        ModelLoader.setCustomModelResourceLocation( item, damage, res );
     }
 
     private void registerItemModel( Block block, String name )
@@ -219,7 +223,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     {
         final ModelResourceLocation res = new ModelResourceLocation( "computercraft:" + name, "inventory" );
         ModelBakery.registerItemVariants( item, new ResourceLocation( "computercraft", name ) );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, new ItemMeshDefinition()
+        ModelLoader.setCustomMeshDefinition( item, new ItemMeshDefinition()
         {
             @Nonnull
             @Override
@@ -243,7 +247,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
             resources[i] = new ResourceLocation( "computercraft", names[i] );
         }
         ModelBakery.registerItemVariants( item, resources );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, definition );
+        ModelLoader.setCustomMeshDefinition( item, definition );
     }
 
     @Override

src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java

@@ -47,8 +47,8 @@ import java.util.List;
 
 public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurtle>
 {
-    private static ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:CC-Turtle", "inventory" );
-    private static ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:CC-TurtleAdvanced", "inventory" );
+    private static ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle", "inventory" );
+    private static ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_advanced", "inventory" );
     private static ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_white", "inventory" );
     private static ModelResourceLocation BEGINNER_TURTLE_MODEL = new ModelResourceLocation( "computercraftedu:CC-TurtleJunior", "inventory" );
     private static ModelResourceLocation[] BEGINNER_TURTLE_COLOUR_MODELS = new ModelResourceLocation[] {

src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontBlinkAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_blink_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_computer_off.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_computer_on.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontOnAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_on_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_modem_off.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/advModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/adv_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_modem_on.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/advModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/adv_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor16",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor4"
+        "front": "computercraft:blocks/adv_monitor16",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor4"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor20",
-        "side": "computercraft:blocks/advMonitor36",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor36"
+        "front": "computercraft:blocks/adv_monitor20",
+        "side": "computercraft:blocks/adv_monitor36",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor36"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/advMonitor15",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor0"
+        "front": "computercraft:blocks/adv_monitor15",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor0"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor19",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor33"
+        "front": "computercraft:blocks/adv_monitor19",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor33"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor31",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor45"
+        "front": "computercraft:blocks/adv_monitor31",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor45"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor18",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor34"
+        "front": "computercraft:blocks/adv_monitor18",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor34"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor30",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor46"
+        "front": "computercraft:blocks/adv_monitor30",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor46"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor24",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor40"
+        "front": "computercraft:blocks/adv_monitor24",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor40"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor27",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor43"
+        "front": "computercraft:blocks/adv_monitor27",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor43"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor25",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor39"
+        "front": "computercraft:blocks/adv_monitor25",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor39"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor28",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor42"
+        "front": "computercraft:blocks/adv_monitor28",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor42"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor17",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor35"
+        "front": "computercraft:blocks/adv_monitor17",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor35"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor29",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor47"
+        "front": "computercraft:blocks/adv_monitor29",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor47"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor23",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor41"
+        "front": "computercraft:blocks/adv_monitor23",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor41"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor26",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor44"
+        "front": "computercraft:blocks/adv_monitor26",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor44"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor22",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor38"
+        "front": "computercraft:blocks/adv_monitor22",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor38"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json

@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor21",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor37"
+        "front": "computercraft:blocks/adv_monitor21",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor37"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_turtle.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_base",
     "textures": {
-        "texture": "computercraft:blocks/turtleAdvanced"
+        "texture": "computercraft:blocks/turtle_advanced"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/advModemFace"
+        "texture": "computercraft:blocks/adv_modem_face"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/advModemFace"
+        "texture": "computercraft:blocks/adv_modem_face"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/advModemFaceOn"
+        "texture": "computercraft:blocks/adv_modem_face_on"
     }
 }

src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/advModemFaceOn"
+        "texture": "computercraft:blocks/adv_modem_face_on"
     }
 }

src/main/resources/assets/computercraft/models/block/cable_arm.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side"
     },
     "elements": [
         {   

src/main/resources/assets/computercraft/models/block/cable_core.json

@@ -1,9 +1,9 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide",
-        "end": "computercraft:blocks/cableCore"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side",
+        "end": "computercraft:blocks/cable_core"
     },
     "elements": [
         {   

src/main/resources/assets/computercraft/models/block/cable_item.json

@@ -1,9 +1,9 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide",
-        "end": "computercraft:blocks/cableCore"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side",
+        "end": "computercraft:blocks/cable_core"
     },
     "elements": [
         {   

src/main/resources/assets/computercraft/models/block/command_computer_blinking.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFrontBlink",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front_blink",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/command_computer_off.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFront",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/command_computer_on.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFrontOn",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front_on",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/computer_blinking.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontBlink",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front_blink",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/computer_off.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFront",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/computer_on.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontOn",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front_on",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/disk_drive_empty.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFront",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }

src/main/resources/assets/computercraft/models/block/disk_drive_full.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFrontAccepted",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front_accepted",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }

src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFrontRejected",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front_rejected",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }

src/main/resources/assets/computercraft/models/block/printer_both_full.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontBothTrays",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_both_trays",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/printer_bottom_full.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontBottomTray",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_bottom_tray",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/printer_empty.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontEmpty",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_empty",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/printer_top_full.json

@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontTopTray",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_top_tray",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/craftyUpgrade"
+        "texture": "computercraft:blocks/crafty_upgrade"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/craftyUpgrade"
+        "texture": "computercraft:blocks/crafty_upgrade"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFace"
+        "texture": "computercraft:blocks/wireless_modem_face"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFace"
+        "texture": "computercraft:blocks/wireless_modem_face"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFaceOn"
+        "texture": "computercraft:blocks/wireless_modem_face_on"
     }
 }

src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json

@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFaceOn"
+        "texture": "computercraft:blocks/wireless_modem_face_on"
     }
 }

src/main/resources/assets/computercraft/models/block/wired_modem_off.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFacePeripheral",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_peripheral",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/wired_modem_on.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFacePeripheralOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_peripheral_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/wireless_modem_off.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wirelessModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wireless_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/block/wireless_modem_on.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wirelessModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wireless_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }

src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerBlinkAdvanced",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_blink_advanced",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }

src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerAdvanced"
+        "layer0": "computercraft:items/pocket_computer_advanced"
     }
 }

src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerOnAdvanced",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_on_advanced",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }

src/main/resources/assets/computercraft/models/item/cable.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/cable_item"
-}
+{
+    "parent": "computercraft:block/cable_item"
+}

src/main/resources/assets/computercraft/models/item/computer.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/computer_blinking"
-}
+{
+    "parent": "computercraft:block/computer_blinking"
+}

src/main/resources/assets/computercraft/models/item/disk.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
     }
 }

src/main/resources/assets/computercraft/models/item/diskExpanded.json

@@ -1,7 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
-    }
-}

src/main/resources/assets/computercraft/models/item/disk_expanded.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
+    }
+}

src/main/resources/assets/computercraft/models/item/pages.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pageBundle"
+        "layer0": "computercraft:items/page_bundle"
     }
 }

src/main/resources/assets/computercraft/models/item/peripheral.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/disk_drive_empty"
-}
+{
+    "parent": "computercraft:block/disk_drive_empty"
+}

src/main/resources/assets/computercraft/models/item/pocketComputer.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/pocketComputer"
-    }
-}

src/main/resources/assets/computercraft/models/item/pocket_computer.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/pocket_computer"
+    }
+}

src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerBlink",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_blink",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }

src/main/resources/assets/computercraft/models/item/pocket_computer_on.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerOn",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_on",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }

src/main/resources/assets/computercraft/models/item/treasureDisk.json

@@ -1,7 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
-    }
-}

src/main/resources/assets/computercraft/models/item/treasure_disk.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
+    }
+}

src/main/resources/assets/computercraft/models/item/turtle.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/turtle"
-}
+{
+    "parent": "computercraft:block/turtle"
+}

src/main/resources/assets/computercraft/models/item/turtle_advanced.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/advanced_turtle"
-}
+{
+    "parent": "computercraft:block/advanced_turtle"
+}

src/main/resources/assets/computercraft/models/item/turtle_expanded.json

@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/turtle"
-}
+{
+    "parent": "computercraft:block/turtle"
+}