mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 12:32:23 +00:00
Fix fruit allele registration
This commit is contained in:
1 parent
306bae490c
commit
17afceab6a
2 files changed
+56
-46
No files matched your search
@@ -91,6 +91,12 @@ public interface IAlleleRegistry {
|
||||
*/
|
||||
Map<String, IAllele> getRegisteredAlleles();
|
||||
|
||||
/**
|
||||
* @return unmodifiable collection of all the known allele variations for the given chromosome type.
|
||||
* @since Forestry 4.2
|
||||
*/
|
||||
Collection<IAllele> getRegisteredAlleles(IChromosomeType type);
|
||||
|
||||
/**
|
||||
* Registers an allele.
|
||||
* <p>
|
||||
@@ -125,12 +131,6 @@ public interface IAlleleRegistry {
|
||||
@Nullable
|
||||
IAllele getAllele(String uid);
|
||||
|
||||
/**
|
||||
* @return unmodifiable collection of all the known allele variations for the given chromosome type.
|
||||
* @since Forestry 4.2
|
||||
*/
|
||||
Collection<IAllele> getRegisteredAlleles(IChromosomeType type);
|
||||
|
||||
/**
|
||||
* @return unmodifiable collection of all the known chromosome types.
|
||||
* @since Forestry 5.0
|
||||
|
||||
@@ -3,76 +3,86 @@ package forestry.arboriculture.genetics.alleles;
|
||||
import javax.annotation.Nullable;
|
||||
import java.awt.Color;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.arboriculture.EnumFruitFamily;
|
||||
import static forestry.api.arboriculture.EnumFruitFamily.*;
|
||||
|
||||
import forestry.api.arboriculture.EnumTreeChromosome;
|
||||
import forestry.api.arboriculture.IAlleleFruit;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.arboriculture.FruitProviderNone;
|
||||
import forestry.arboriculture.FruitProviderPod;
|
||||
import forestry.arboriculture.FruitProviderPod.EnumPodType;
|
||||
import forestry.arboriculture.FruitProviderRandom;
|
||||
import forestry.arboriculture.FruitProviderRipening;
|
||||
import forestry.core.items.ItemFruit;
|
||||
import forestry.core.items.ItemFruit.EnumFruit;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class AlleleFruits {
|
||||
public static final IAlleleFruit fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", EnumFruitFamily.NONE));
|
||||
public static final IAlleleFruit fruitApple = new AlleleFruit("apple", new FruitProviderRandom("for.fruits.apple", EnumFruitFamily.POMES, new ItemStack(Items.APPLE), 1.0f)
|
||||
.setColour(new Color(0xff2e2e))
|
||||
.setOverlay("pomes"));
|
||||
public static final IAlleleFruit fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("for.fruits.cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA, new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage())));
|
||||
// .setColours(0xecdca5, 0xc4d24a), true);
|
||||
public static final IAlleleFruit fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("for.fruits.chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f)
|
||||
.setRipeningPeriod(6)
|
||||
.setColours(new Color(0x7f333d), new Color(0xc4d24a))
|
||||
.setOverlay("nuts"), true);
|
||||
public static final IAlleleFruit fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("for.fruits.walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f)
|
||||
.setRipeningPeriod(8)
|
||||
.setColours(new Color(0xfba248), new Color(0xc4d24a))
|
||||
.setOverlay("nuts"), true);
|
||||
public static final IAlleleFruit fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("for.fruits.cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f)
|
||||
.setColours(new Color(0xff2e2e), new Color(0xc4d24a))
|
||||
.setOverlay("berries"), true);
|
||||
public static final IAlleleFruit fruitDates = new AlleleFruit("dates", new FruitProviderPod("for.fruits.dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4)));
|
||||
public static final IAlleleFruit fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("for.fruits.papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack()));
|
||||
public static final IAlleleFruit fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("for.fruits.lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f)
|
||||
.setColours(new Color(0xeeee00), new Color(0x99ff00))
|
||||
.setOverlay("citrus"), true);
|
||||
public static final IAlleleFruit fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("for.fruits.plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f)
|
||||
.setColours(new Color(0x663446), new Color(0xeeff1a))
|
||||
.setOverlay("plums"), true);
|
||||
@Nullable
|
||||
private static List<IAlleleFruit> fruitAlleles;
|
||||
public static final IAlleleFruit fruitNone;
|
||||
public static final IAlleleFruit fruitApple;
|
||||
public static final IAlleleFruit fruitCocoa;
|
||||
public static final IAlleleFruit fruitChestnut;
|
||||
public static final IAlleleFruit fruitWalnut;
|
||||
public static final IAlleleFruit fruitCherry;
|
||||
public static final IAlleleFruit fruitDates;
|
||||
public static final IAlleleFruit fruitPapaya;
|
||||
public static final IAlleleFruit fruitLemon;
|
||||
public static final IAlleleFruit fruitPlum;
|
||||
private static final List<IAlleleFruit> fruitAlleles;
|
||||
@Nullable
|
||||
private static List<IAlleleFruit> fruitAllelesWithModels;
|
||||
|
||||
static {
|
||||
ItemStack cocoaBean = new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage());
|
||||
|
||||
fruitAlleles = Arrays.asList(
|
||||
fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", NONE)),
|
||||
fruitApple = new AlleleFruit("apple", new FruitProviderRandom("for.fruits.apple", POMES, new ItemStack(Items.APPLE), 1.0f)
|
||||
.setColour(new Color(0xff2e2e))
|
||||
.setOverlay("pomes")),
|
||||
fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("for.fruits.cocoa", JUNGLE, EnumPodType.COCOA, cocoaBean)),
|
||||
// .setColours(0xecdca5, 0xc4d24a), true)
|
||||
fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("for.fruits.chestnut", NUX, EnumFruit.CHESTNUT.getStack(), 1.0f)
|
||||
.setRipeningPeriod(6)
|
||||
.setColours(new Color(0x7f333d), new Color(0xc4d24a))
|
||||
.setOverlay("nuts"), true),
|
||||
fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("for.fruits.walnut", NUX, EnumFruit.WALNUT.getStack(), 1.0f)
|
||||
.setRipeningPeriod(8)
|
||||
.setColours(new Color(0xfba248), new Color(0xc4d24a))
|
||||
.setOverlay("nuts"), true),
|
||||
fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("for.fruits.cherry", PRUNES, EnumFruit.CHERRY.getStack(), 1.0f)
|
||||
.setColours(new Color(0xff2e2e), new Color(0xc4d24a))
|
||||
.setOverlay("berries"), true),
|
||||
fruitDates = new AlleleFruit("dates", new FruitProviderPod("for.fruits.dates", JUNGLE, EnumPodType.DATES, EnumFruit.DATES.getStack(4))),
|
||||
fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("for.fruits.papaya", JUNGLE, EnumPodType.PAPAYA, EnumFruit.PAPAYA.getStack())),
|
||||
fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("for.fruits.lemon", PRUNES, EnumFruit.LEMON.getStack(), 1.0f)
|
||||
.setColours(new Color(0xeeee00), new Color(0x99ff00))
|
||||
.setOverlay("citrus"), true),
|
||||
fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("for.fruits.plum", PRUNES, EnumFruit.PLUM.getStack(), 1.0f)
|
||||
.setColours(new Color(0x663446), new Color(0xeeff1a))
|
||||
.setOverlay("plums"), true)
|
||||
);
|
||||
}
|
||||
|
||||
public static void registerAlleles() {
|
||||
for (IAlleleFruit fruitAllele : getFruitAlleles()) {
|
||||
for (IAlleleFruit fruitAllele : fruitAlleles) {
|
||||
AlleleManager.alleleRegistry.registerAllele(fruitAllele, EnumTreeChromosome.FRUITS);
|
||||
}
|
||||
}
|
||||
|
||||
public static List<IAlleleFruit> getFruitAlleles() {
|
||||
if (fruitAlleles == null) {
|
||||
fruitAlleles = new ArrayList<>();
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleFruit) {
|
||||
IAlleleFruit alleleFruit = (IAlleleFruit) allele;
|
||||
fruitAlleles.add(alleleFruit);
|
||||
}
|
||||
}
|
||||
}
|
||||
return fruitAlleles;
|
||||
}
|
||||
|
||||
public static List<IAlleleFruit> getFruitAllelesWithModels() {
|
||||
if (fruitAllelesWithModels == null) {
|
||||
fruitAllelesWithModels = new ArrayList<>();
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles(EnumTreeChromosome.FRUITS)) {
|
||||
if (allele instanceof IAlleleFruit) {
|
||||
IAlleleFruit alleleFruit = (IAlleleFruit) allele;
|
||||
if (alleleFruit.getModelName() != null) {
|
||||
|
||||
Reference in new issue
Block a user