Compare commits

..
3 Commits
Author SHA1 Message Date
DrParadox7 c9545edcf7 Merge branch 'master' into PR-InvalidBlooms 2025-05-17 16:07:55 +02:00
DrParadox7 c6fa47dc57 Remove commented out code 2025-05-17 16:00:03 +02:00
DrParadox7 4f77d6a56c Disable flowers that cannot be planted
Disables BoP's hardcoded Enderlotus and the Miner's Delight floral generation, which cannot be planted.
Any attempt to spawn these flowers in this manner causes them to instantly break, and drop themselves as itemstacks.
2025-05-15 19:32:57 +02:00
12 changed files with 49 additions and 51 deletions

No files matched your search

+3 -3
View File
@@ -2,10 +2,10 @@
dependencies {
api('curse.maven:cofh-lib-220333:2388748')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta51:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.66-GTNH:dev')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta42:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev')
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly('curse.maven:craftguide-75557:2459320')
}
+2 -2
View File
@@ -80,7 +80,7 @@ apiPackage = api
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# There can be multiple files in a space-separated list.
# Example value: mymodid_at.cfg nei_at.cfg
accessTransformersFile = forestry_at.cfg
accessTransformersFile =
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
usesMixins = false
@@ -151,7 +151,7 @@ modrinthProjectId =
# type can be one of [project, version],
# and the name is the Modrinth project or version slug/id of the other mod.
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
modrinthRelations =
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
}
@@ -213,7 +213,6 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe
private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<Flower> acceptedFlowers,
World world, int x, int y, int z) {
if (!world.blockExists(x, y, z)) return false;
Block block = world.getBlock(x, y, z);
final int meta;
@@ -24,7 +24,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
@Override
public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual,
int x, int y, int z) {
if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
if (!world.isAirBlock(x, y, z)) {
return false;
}
@@ -39,7 +39,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
@Override
public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) {
if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
if (!world.isAirBlock(x, y, z)) {
return false;
}
@@ -34,10 +34,6 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule {
}
private static boolean growFlower(String flowerType, World world, int x, int y, int z) {
if (!world.blockExists(x, y, z)) {
return false;
}
TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileEntityFlowerPot)) {
return false;
@@ -773,9 +773,6 @@ public class Bee extends IndividualLiving implements IBee {
for (int i = 0; i < 20; i++) {
Vect randomPos = Vect.getRandomPositionInArea(random, area);
Vect blockPos = Vect.add(housingPos, randomPos, offset);
if (!world.blockExists(blockPos.x, blockPos.y, blockPos.z)) {
continue;
}
TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z);
if (tile instanceof IPollinatable) {
@@ -31,7 +31,7 @@ public class ItemForestryTool extends ItemForestry {
setMaxDamage(200);
this.remnants = remnants;
if (remnants != null) {
MinecraftForge.EVENT_BUS.register(new EventHandler());
MinecraftForge.EVENT_BUS.register(this);
}
}
@@ -53,6 +53,20 @@ public class ItemForestryTool extends ItemForestry {
return ForgeHooks.canToolHarvestBlock(block, 0, stack);
}
@SubscribeEvent
public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
if (event.original == null || event.original.getItem() != this) {
return;
}
EntityPlayer player = event.entityPlayer;
World world = player.worldObj;
if (!world.isRemote && remnants != null) {
ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
}
}
@Override
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
EntityLivingBase entityliving) {
@@ -66,21 +80,4 @@ public class ItemForestryTool extends ItemForestry {
public boolean isFull3D() {
return true;
}
public class EventHandler {
@SubscribeEvent
public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
if (event.original == null || event.original.getItem() != ItemForestryTool.this) {
return;
}
EntityPlayer player = event.entityPlayer;
World world = player.worldObj;
if (!world.isRemote && remnants != null) {
ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
}
}
}
}
@@ -112,12 +112,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
super.handleTooltip(guiRecipe, currenttip, recipe);
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
Point mouse = GuiDraw.getMousePosition();
Point offset = guiRecipe.getRecipePosition(recipe);
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
if (recipeIndex >= 0) {
Point offset = guiRecipe.getRecipePosition(recipeIndex);
Point relMouse = new Point(
mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
}
}
return currenttip;
@@ -129,10 +135,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
Point mouse = GuiDraw.getMousePosition();
Point offset = guiRecipe.getRecipePosition(recipe);
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
if (recipeIndex >= 0) {
Point offset = guiRecipe.getRecipePosition(recipeIndex);
Point relMouse = new Point(
mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
}
return currenttip;
}
public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
@@ -196,9 +210,11 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
Point mouse = GuiDraw.getMousePosition();
Point mousepos = GuiDraw.getMousePosition();
Point offset = guiRecipe.getRecipePosition(recipe);
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
Point relMouse = new Point(
mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
if (crecipe.getFluidTanks() != null) {
for (PositionedFluidTank tank : crecipe.getFluidTanks()) {
@@ -96,8 +96,6 @@ public class GeneticsUtil {
* altering the world by changing vanilla leaves to forestry ones.
*/
public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) {
if (!world.blockExists(x, y, z)) return null;
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof IPollinatable) {
@@ -1,5 +0,0 @@
# Forestry Access Transformer configuration file
public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
@@ -150,7 +150,7 @@ gui.maxspeed=Mбximo
gui.fastest=Rбpida++
gui.faster=Rбpida+
gui.fast=Rбpida
gui.slow=Lenta
gui.slowLenta
gui.slower=Lenta+
gui.slowest=Lenta++
gui.longestlife=Longa++