Add Fertilized Dirt from RandomThings to recognized farmland list for CustomSeedFarmer (#87)

* Update buildscript & NEI version

* Add Fertilized Dirt from RandomThings to recognized farmland list for CustomSeedFarmer
This commit is contained in:
miozune authored and GitHub committed 2022-10-13 09:57:40 +02:00
1 parent 727aed1335
commit 864e5c03b3
6 files changed
+16 -9

No files matched your search

+5 -5
View File
@@ -1,4 +1,4 @@
//version: 1664372158
//version: 1665425597
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -662,10 +662,10 @@ publishing {
}
}
if (modrinthProjectId.size() != 0) {
if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
apply plugin: 'com.modrinth.minotaur'
File changelogFile = new File("CHANGELOG.md")
File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md")
modrinth {
token = System.getenv("MODRINTH_TOKEN")
@@ -695,10 +695,10 @@ if (modrinthProjectId.size() != 0) {
tasks.publish.dependsOn(tasks.modrinth)
}
if (curseForgeProjectId.size() != 0) {
if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null) {
apply plugin: 'com.matthewprenger.cursegradle'
File changelogFile = new File("CHANGELOG.md")
File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md")
curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN")
+1 -1
View File
@@ -3,7 +3,7 @@
dependencies {
compile('com.github.GTNewHorizons:EnderCore:0.2.9:dev')
compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev')
compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
compile('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
shadowImplementation('cglib:cglib-nodep:3.3.0')
+3
View File
@@ -62,6 +62,9 @@ coreModClass =
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
containsMixinsAndOrCoreModOnly = false
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
forceEnableMixins = false
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
usesShadowedDependencies = true
@@ -44,6 +44,10 @@ public class CustomSeedFarmer implements IFarmerJoe {
if (ztonesSoil != null) {
addTilledBlock(ztonesSoil);
}
Block rtSoil = GameRegistry.findBlock("RandomThings", "fertilizedDirt_tilled");
if (rtSoil != null) {
addTilledBlock(rtSoil);
}
}
public void addTilledBlock(Block block) {
@@ -124,7 +124,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
}
@Override
public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex);
float chance = recipe.getChanceForOutput(stack);
if (chance > 0 && chance < 1) {
@@ -189,12 +189,12 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
}
@Override
public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
return currenttip;
}
@Override
public List<String> handleTooltip(GuiRecipe gui, List<String> currenttip, int recipeIndex) {
public List<String> handleTooltip(GuiRecipe<?> gui, List<String> currenttip, int recipeIndex) {
InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
Point pos = GuiDraw.getMousePosition();
Point offset = gui.getRecipePosition(recipeIndex);