Fix some names

This commit is contained in:
Nedelosk committed 2017-04-10 13:06:19 +02:00
1 parent 12ade3a559
commit b84e29a3f0
5 files changed
+15 -18

No files matched your search

@@ -155,9 +155,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
if (!speciesMutations.isEmpty()) {
final Set<IMutation> 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<IAlleleSpecies> participatingSpecies = new LinkedHashSet<>();
@@ -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
@@ -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);
@@ -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);