From b84e29a3f0bd844ffdcfad4f7210030556a1478e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 10 Apr 2017 13:06:19 +0200 Subject: [PATCH] Fix some names --- .../binnie/core/genetics/BreedingSystem.java | 3 --- .../binnie/extratrees/block/EnumShrubLog.java | 10 +++++----- .../extratrees/genetics/ETTreeDefinition.java | 2 +- .../extratrees/genetics/ExtraTreeMutation.java | 2 +- .../resources/assets/extratrees/lang/en_US.lang | 16 ++++++++-------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 9130b2e7..47e85eb3 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -155,9 +155,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { if (!speciesMutations.isEmpty()) { final Set mutations = new LinkedHashSet<>(); mutations.addAll(speciesMutations); - if (this == Binnie.GENETICS.beeBreedingSystem) { - mutations.addAll(ExtraBeeMutation.mutations); - } for (final IMutation mutation : mutations) { this.allMutations.add(mutation); final Set participatingSpecies = new LinkedHashSet<>(); diff --git a/src/main/java/binnie/extratrees/block/EnumShrubLog.java b/src/main/java/binnie/extratrees/block/EnumShrubLog.java index 933bee04..7d21e9ab 100644 --- a/src/main/java/binnie/extratrees/block/EnumShrubLog.java +++ b/src/main/java/binnie/extratrees/block/EnumShrubLog.java @@ -41,27 +41,27 @@ public enum EnumShrubLog implements IWoodType { @Override public String getPlankTexture() { - return "tetxures/planks_oak"; + return "blocks/planks_oak"; } @Override public String getHeartTexture() { - return "tetxures/log_oak_top"; + return "blocks/log_oak_top"; } @Override public String getDoorLowerTexture() { - return "tetxures/door_wood_lower"; + return "blocks/door_wood_lower"; } @Override public String getDoorUpperTexture() { - return "tetxures/door_wood_upper"; + return "blocks/door_wood_upper"; } @Override public String getBarkTexture() { - return "tetxures/log_oak"; + return "blocks/log_oak"; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 8ee4443f..28691e99 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -1227,7 +1227,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)) { + OsangeOrange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.OsangeOsange(tree); diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index c8a37965..39057b85 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -92,7 +92,7 @@ public class ExtraTreeMutation implements ITreeMutation { new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Teak"), ETTreeDefinition.Iroko.getSpecies(), 10); new ExtraTreeMutation(ETTreeDefinition.OrchardApple.getSpecies(), getVanilla("Birch"), ETTreeDefinition.Pear.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.OldFustic.getSpecies(), 10); - new ExtraTreeMutation(ETTreeDefinition.OldFustic.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.OsangeOsange.getSpecies(), 10); + new ExtraTreeMutation(ETTreeDefinition.OldFustic.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.OsangeOrange.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.Brazilwood.getSpecies(), 10); new ExtraTreeMutation(ETTreeDefinition.Brazilwood.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.Purpleheart.getSpecies(), 10); new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.Rosewood.getSpecies(), 10); diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index a530242a..67365076 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -244,7 +244,7 @@ extratrees.species.sweetcrabapple.name=Sweet Crabapple extratrees.species.floweringcrabapple.name=Flowering Crabapple extratrees.species.prairiecrabapple.name=Prairie Crabapple extratrees.species.blackthorn.name=Blackthorn -extratrees.species.cherry_plum.name=Cherry Plum +extratrees.species.cherryplum.name=Cherry Plum extratrees.species.peach.name=Peach extratrees.species.nectarine.name=Nectarine extratrees.species.apricot.name=Apricot @@ -257,15 +257,15 @@ extratrees.species.manderin.name=Manderine extratrees.species.satsuma.name=Satsuma extratrees.species.tangerine.name=Tangerine extratrees.species.lime.name=Lime -extratrees.species.key_lime.name=Key Lime -extratrees.species.finger_lime.name=Finger Lime +extratrees.species.keylime.name=Key Lime +extratrees.species.fingerlime.name=Finger Lime extratrees.species.pomelo.name=Pomelo extratrees.species.grapefruit.name=Grapefruit extratrees.species.kumquat.name=Kumquat extratrees.species.citron.name=Citron -extratrees.species.buddha_hand.name=Buddha's Hand +extratrees.species.buddhahand.name=Buddha's Hand extratrees.species.banana.name=Banana -extratrees.species.red_banana.name=Red Banana +extratrees.species.redbanana.name=Red Banana extratrees.species.plantain.name=Plantain extratrees.species.butternut.name=Butternut extratrees.species.rowan.name=Common Rowan @@ -301,7 +301,7 @@ extratrees.species.loblollypine.name=Loblolly Pine extratrees.species.sweetgum.name=Sweetgum extratrees.species.locust.name=Black Locust extratrees.species.pear.name=Cultivated Pear -extratrees.species.osange_orange.name=Osange-Orange +extratrees.species.osangeorange.name=Osange-Orange extratrees.species.oldfustic.name=Old Fustic extratrees.species.brazilwood.name=Brazilwood extratrees.species.logwood.name=Logwood @@ -309,7 +309,7 @@ extratrees.species.rosewood.name=Rosewood extratrees.species.purpleheart.name=Purpleheart extratrees.species.iroko.name=Iroko extratrees.species.gingko.name=Ginkgo -extratrees.species.brazil_nut.name=Brazil Nut +extratrees.species.brazilnut.name=Brazil Nut extratrees.species.rosegum.name=Rose Gum extratrees.species.swampgum.name=Swamp Gum extratrees.species.box.name=Boxwood @@ -326,7 +326,7 @@ extratrees.species.blueberry.name=Blueberry extratrees.species.cranberry.name=Cranberry extratrees.species.juniper.name=Juniper extratrees.species.gooseberry.name=Gooseberry -extratrees.species.golden_raspberry.name=Golden Raspberry +extratrees.species.goldenraspberry.name=Golden Raspberry extratrees.species.cinnamon.name=Cinnamon extratrees.species.coconut.name=Coconut extratrees.species.cashew.name=Cashew