Jump to content

getClassFromName().entrySet VS ENTITIES.getEntries()


HarroldSaxon

Recommended Posts

I'm updating a mod from 1.10.2 to 1.12.2, and am somewhat confused about the registry changes. I can generate files, but i don't think the generated files are being loaded correctly.

here's the original code

Spoiler

        // Generate or load each mob file.
        String fileName;
        File directory, propFile;
        JsonObject props;
        for (Entry<String, Class<? extends Entity>> mobEntry : EntityList.getClassFromName().entrySet()) {
            if (MobProperties.getProperties(mobEntry.getKey()) == null && EntityLivingBase.class.isAssignableFrom(mobEntry.getValue()) && !Modifier.isAbstract(mobEntry.getValue().getModifiers())) {
                directory = FileHelper.PROPS_DIRECTORY;
                fileName = mobEntry.getKey();
                String[] split = fileName.split("\\.", 2);
                if (mobEntry.getValue().getName().startsWith("net.minecraft.")) {
                    if (split.length > 1) split[0] = split[0] + "." + split[1]; // Just in case a vanilla id has a "."
                    split = new String[] { "minecraft", split[0] };
                }
                if (split.length > 1) {
                    fileName = split[1];
                    char[] dirNameArray = split[0].toCharArray();
                    split[0] = "";
                    for (char letter : dirNameArray) {
                        split[0] += Character.isLetterOrDigit(letter) ? Character.toString(letter) : "_";
                    }
                    directory = new File(directory, split[0]);
                    directory.mkdirs();
                }
                char[] fileNameArray = fileName.toCharArray();
                fileName = "";
                for (char letter : fileNameArray) {
                    fileName += Character.isLetterOrDigit(letter) ? Character.toString(letter) : "_";
                }
                try {
                    propFile = new File(directory, fileName + FileHelper.FILE_EXT);
                    if (propFile.exists()) {
                        int attempt = 0;
                        for (; attempt < 100; attempt++)
                            if (! (propFile = new File(directory, fileName + attempt + FileHelper.FILE_EXT)).exists()) {
                                break;
                            }
                        if (attempt > 99) {
                            ModMobProperties.logWarning("Failed to generate default properties file for \"" + mobEntry.getKey() + "\"!");
                            continue;
                        }
                        fileName += attempt;
                    }
                    props = new JsonObject();
                    props.addProperty("_name", mobEntry.getKey());
                    for (Map.Entry<String, JsonElement> entry : defaultProps.entrySet()) {
                        if (entry.getKey() != null && !entry.getKey().equals("_name") && !entry.getKey().equals("_comment")) {
                            props.add(entry.getKey(), entry.getValue());
                        }
                    }
                    propFile.createNewFile();
                    FileWriter out = new FileWriter(propFile);
                    FileHelper.GSON_PRETTY.toJson(props, out);
                    out.close();
                    filesGenerated++;
                    MobProperties.load(propFile.getPath(), props);
                }
                catch (MobPropertyException ex) {
                    throw ex;
                }
                catch (Exception ex) {
                    ModMobProperties.logWarning("Failed to generate default properties file for \"" + mobEntry.getKey() + "\"!");
                    ex.printStackTrace();
                }
            }
        }
        return filesGenerated;

and here's my changes

Spoiler

        // Generate or load each mob file.
        String fileName;
        File directory, propFile;
        JsonObject props;
        for(Entry<ResourceLocation, EntityEntry> mobEntry : ForgeRegistries.ENTITIES.getEntries()) {                                                    
            if (MobProperties.getProperties(mobEntry.getKey().toString()) == null && EntityLivingBase.class.isAssignableFrom(mobEntry.getValue().getEntityClass()) && !Modifier.isAbstract(mobEntry.getValue().getEntityClass().getModifiers())) {
                directory = FileHelper.PROPS_DIRECTORY;
                fileName = mobEntry.getKey().toString();
                String[] split = fileName.split("\\.", 2);
                if (mobEntry.getValue().getName().startsWith("net.minecraft.")) {
                    if (split.length > 1) split[0] = split[0] + "." + split[1]; // Just in case a vanilla id has a "."
                    split = new String[] { "minecraft", split[0] };
                }
                if (split.length > 1) {
                    fileName = split[1];
                    char[] dirNameArray = split[0].toCharArray();
                    split[0] = "";
                    for (char letter : dirNameArray) {
                        split[0] += Character.isLetterOrDigit(letter) ? Character.toString(letter) : "_";
                    }
                    directory = new File(directory, split[0]);
                    directory.mkdirs();
                }
                char[] fileNameArray = fileName.toCharArray();
                fileName = "";
                for (char letter : fileNameArray) {
                    fileName += Character.isLetterOrDigit(letter) ? Character.toString(letter) : "_";
                }
                try {
                    propFile = new File(directory, fileName + FileHelper.FILE_EXT);
                    if (propFile.exists()) {
                        int attempt = 0;
                        for (; attempt < 100; attempt++)
                            if (! (propFile = new File(directory, fileName + attempt + FileHelper.FILE_EXT)).exists()) {
                                break;
                            }
                        if (attempt > 99) {
                            ModMobProperties.logWarning("Failed to generate default properties file for \"" + mobEntry.getKey() + "\"!");
                            continue;
                        }
                        fileName += attempt;
                    }
                    props = new JsonObject();
                    props.addProperty("_name", mobEntry.getKey().toString());
   ///pretty sure this is wrong XD   ^
                    for (Map.Entry<String, JsonElement> entry : defaultProps.entrySet()) {
                        if (entry.getKey() != null && !entry.getKey().equals("_name") && !entry.getKey().equals("_comment")) {
                            props.add(entry.getKey(), entry.getValue());
                        }
                    }
                    propFile.createNewFile();
                    FileWriter out = new FileWriter(propFile);
                    FileHelper.GSON_PRETTY.toJson(props, out);
                    out.close();
                    filesGenerated++;
                    MobProperties.load(propFile.getPath(), props);
                }
                catch (MobPropertyException ex) {
                    throw ex;
                }
                catch (Exception ex) {
                    ModMobProperties.logWarning("Failed to generate default properties file for \"" + mobEntry.getKey() + "\"!");
                    ex.printStackTrace();
                }
            }
        }
        return filesGenerated;

I know i have at least one line wrong, not sure what i should be using instead. If anyone can point me in the right direction, I'd greatly appreciate it.

Link to comment
Share on other sites

This code loads, or generates if not found, a file for each entity in a folder in configs, named and containing the entity's id by default. additional information added to these files is used by the mod to alter some in game behaviors, but at the moment those files are not loading correctly.

Link to comment
Share on other sites

2 hours ago, HarroldSaxon said:

This code loads, or generates if not found, a file for each entity in a folder in configs, named and containing the entity's id by default. additional information added to these files is used by the mod to alter some in game behaviors, but at the moment those files are not loading correctly.

Step through the code in the debugger.

VANILLA MINECRAFT CLASSES ARE THE BEST RESOURCES WHEN MODDING

I will be posting 1.15.2 modding tutorials on this channel. If you want to be notified of it do the normal YouTube stuff like subscribing, ect.

Forge and vanilla BlockState generator.

Link to comment
Share on other sites

  • 6 months later...

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Unfortunately, your content contains terms that we do not allow. Please edit your content to remove the highlighted words below.
Reply to this topic...

×   Pasted as rich text.   Restore formatting

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Announcements



×
×
  • Create New...

Important Information

By using this site, you agree to our Terms of Use.