mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-29 00:23:23 +00:00
Code Issues Releases Wiki Activity
bf6d017ad1
CC-Tweaked/src/main/java/dan200/computercraft/client/ClientRegistry.java

168 lines
6.2 KiB
Java
Raw Normal View History

Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
/*
* This file is part of ComputerCraft - http://www.computercraft.info
Happy new year
2020-01-01 00:09:18 +00:00
* Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
* Send enquiries to dratcliffe@gmail.com
*/
package dan200.computercraft.client;
import dan200.computercraft.ComputerCraft;
Load turtle item models using a model loader This is far more elegant than our weird method of baking things and manually inserting them into the model map. Also means we no longer need the whole turtle_dynamic thing.
2019-02-10 09:45:15 +00:00
import dan200.computercraft.client.render.TurtleModelLoader;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import dan200.computercraft.shared.common.IColouredItem;
import dan200.computercraft.shared.media.items.ItemDisk;
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
Some further cleanup and 1.13 cherry-picks Are most of these changes small and petty? Yes. However, IMO they do make the code more readable. Anyway, a summary of some of the more interesting changes: - Expose Abstract*Upgrade classes in the API - Fix the spelling of Jonathan in the API docs (*shakes fist*) - Fix bug with printout not working in the offhand. - Rename any argments/variables accidentally named "m_*", and add an inspection to prevent it happening again. - Remove most of the Block*.Properties classes - just inline them in the parent class. - Return super.writeToNBT instead of reassigning at the top.
2019-04-02 10:50:13 +00:00
import dan200.computercraft.shared.util.Colour;
Add back texture registration hook I totally forgot to do this when Forge re-added this functionality. Fixes #285
2019-08-18 15:12:16 +00:00
import net.minecraft.client.Minecraft;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ModelResourceLocation;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.util.ResourceLocation;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import net.minecraftforge.api.distmarker.Dist;
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
import net.minecraftforge.client.event.ColorHandlerEvent;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
import net.minecraftforge.client.model.BasicState;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import net.minecraftforge.eventbus.api.SubscribeEvent;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
import net.minecraftforge.fml.common.Mod;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import java.util.HashSet;
import java.util.Map;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
/**
* Registers textures and models for items.
*/
Bump Forge version Turtle models now work (though texture registration is still broken).
2019-06-23 14:30:29 +00:00
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public final class ClientRegistry
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
{
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
private static final String[] EXTRA_MODELS = new String[] {
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
"turtle_modem_normal_off_left",
"turtle_modem_normal_on_left",
"turtle_modem_normal_off_right",
"turtle_modem_normal_on_right",
"turtle_modem_advanced_off_left",
"turtle_modem_advanced_on_left",
"turtle_modem_advanced_off_right",
"turtle_modem_advanced_on_right",
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
"turtle_crafting_table_left",
"turtle_crafting_table_right",
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
"turtle_speaker_upgrade_left",
"turtle_speaker_upgrade_right",
Load turtle item models using a model loader This is far more elegant than our weird method of baking things and manually inserting them into the model map. Also means we no longer need the whole turtle_dynamic thing.
2019-02-10 09:45:15 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
"turtle_colour",
Load turtle item models using a model loader This is far more elegant than our weird method of baking things and manually inserting them into the model map. Also means we no longer need the whole turtle_dynamic thing.
2019-02-10 09:45:15 +00:00
"turtle_elf_overlay",
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
};
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
private static final String[] EXTRA_TEXTURES = new String[] {
Add back texture registration hook I totally forgot to do this when Forge re-added this functionality. Fixes #285
2019-08-18 15:12:16 +00:00
// TODO: Gather these automatically from the model. Sadly the model loader isn't available
// when stitching textures.
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
"block/turtle_colour",
"block/turtle_elf_overlay",
"block/turtle_crafty_face",
"block/turtle_speaker_face",
};
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
private ClientRegistry() {}
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
@SubscribeEvent
public static void registerModels( ModelRegistryEvent event )
{
Load turtle item models using a model loader This is far more elegant than our weird method of baking things and manually inserting them into the model map. Also means we no longer need the whole turtle_dynamic thing.
2019-02-10 09:45:15 +00:00
ModelLoaderRegistry.registerLoader( TurtleModelLoader.INSTANCE );
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
}
@SubscribeEvent
public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
{
Add back texture registration hook I totally forgot to do this when Forge re-added this functionality. Fixes #285
2019-08-18 15:12:16 +00:00
if( event.getMap() != Minecraft.getInstance().getTextureMap() ) return;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
for( String extra : EXTRA_TEXTURES )
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
{
Add back texture registration hook I totally forgot to do this when Forge re-added this functionality. Fixes #285
2019-08-18 15:12:16 +00:00
event.addSprite( new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
}
}
@SubscribeEvent
public static void onModelBakeEvent( ModelBakeEvent event )
{
Load turtle item models using a model loader This is far more elegant than our weird method of baking things and manually inserting them into the model map. Also means we no longer need the whole turtle_dynamic thing.
2019-02-10 09:45:15 +00:00
// Load all extra models
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
ModelLoader loader = event.getModelLoader();
Bump Forge version Turtle models now work (though texture registration is still broken).
2019-06-23 14:30:29 +00:00
Map<ResourceLocation, IBakedModel> registry = event.getModelRegistry();
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
for( String model : EXTRA_MODELS )
{
IBakedModel bakedModel = bake( loader, loader.getUnbakedModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/" + model ) ) );
if( bakedModel != null )
{
registry.put(
new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ),
bakedModel
);
}
}
// And load the custom turtle models in too.
registry.put(
new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_normal" ), "inventory" ),
bake( loader, TurtleModelLoader.INSTANCE.loadModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/turtle_normal" ) ) )
);
registry.put(
new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ), "inventory" ),
bake( loader, TurtleModelLoader.INSTANCE.loadModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/turtle_advanced" ) ) )
);
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
}
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
@SubscribeEvent
public static void onItemColours( ColorHandlerEvent.Item event )
{
Add check for if item/block registration has failed If mod loading fails, we'll continue to load colour handlers. As blocks/items have not been registered, then we'll throw an NPE. See MinecraftForge/MinecraftForge#5682. Somewhat fixes #168.
2019-04-09 15:32:20 +00:00
if( ComputerCraft.Items.disk == null || ComputerCraft.Blocks.turtleNormal == null )
{
ComputerCraft.log.warn( "Block/item registration has failed. Skipping registration of item colours." );
return;
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
event.getItemColors().register(
( stack, layer ) -> layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF,
ComputerCraft.Items.disk
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
);
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
event.getItemColors().register( ( stack, layer ) -> {
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
switch( layer )
{
case 0:
default:
return 0xFFFFFF;
Cherry pick several improvements from 1.13 - Move container opening (and gui handling) into a separate class - Move turtle/computer placement code onto the block - GUIs now use gui{Left,Top} instead of calculating it manually. - IPeripheralTile is now exposed in the API.
2019-03-27 18:59:02 +00:00
case 1: // Frame colour
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return IColouredItem.getColourBasic( stack );
Cherry pick several improvements from 1.13 - Move container opening (and gui handling) into a separate class - Move turtle/computer placement code onto the block - GUIs now use gui{Left,Top} instead of calculating it manually. - IPeripheralTile is now exposed in the API.
2019-03-27 18:59:02 +00:00
case 2: // Light colour
Some further cleanup and 1.13 cherry-picks Are most of these changes small and petty? Yes. However, IMO they do make the code more readable. Anyway, a summary of some of the more interesting changes: - Expose Abstract*Upgrade classes in the API - Fix the spelling of Jonathan in the API docs (*shakes fist*) - Fix bug with printout not working in the offhand. - Rename any argments/variables accidentally named "m_*", and add an inspection to prevent it happening again. - Remove most of the Block*.Properties classes - just inline them in the parent class. - Return super.writeToNBT instead of reassigning at the top.
2019-04-02 10:50:13 +00:00
{
int light = ItemPocketComputer.getLightState( stack );
return light == -1 ? Colour.Black.getHex() : light;
}
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
}, ComputerCraft.Items.pocketComputerNormal, ComputerCraft.Items.pocketComputerAdvanced );
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
// Setup turtle colours
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
event.getItemColors().register(
( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
ComputerCraft.Blocks.turtleNormal, ComputerCraft.Blocks.turtleAdvanced
Cherry pick several improvements from 1.13 - Move container opening (and gui handling) into a separate class - Move turtle/computer placement code onto the block - GUIs now use gui{Left,Top} instead of calculating it manually. - IPeripheralTile is now exposed in the API.
2019-03-27 18:59:02 +00:00
);
Register item colour handlers on the event instead Another step on my misguided quest to get rid of proxies
2019-02-10 09:55:06 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
private static IBakedModel bake( ModelLoader loader, IUnbakedModel model )
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
{
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
model.getTextures( loader::getUnbakedModel, new HashSet<>() );
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return model.bake(
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
loader,
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
ModelLoader.defaultTextureGetter(),
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
new BasicState( model.getDefaultState(), false ), DefaultVertexFormats.BLOCK
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
);
}
}
Reference in New Issue Copy Permalink