Fix faucets not working, this logic was removed in Alexdoru's refactor (#70)

* Fix faucets not working, this logic was removed in Alexdoru's refactor

* Update dependencies
This commit is contained in:
Raven Szewczyk authored and GitHub committed 2023-02-01 17:52:21 +01:00
1 parent c76eca4f1b
commit 4be977b728
7 files changed
+61 -23

No files matched your search

+3 -2
View File
@@ -1,4 +1,4 @@
//version: 1675110695 //version: 1675173326
/* /*
DO NOT CHANGE THIS FILE! DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available. Also, you may replace this file at any time if there is an update available.
@@ -66,7 +66,7 @@ plugins {
id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.modrinth.minotaur' version '2.+' apply false id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2' id 'com.gtnewhorizons.retrofuturagradle' version '1.1.3'
} }
boolean settingsupdated = verifySettingsGradle() boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated settingsupdated = verifyGitAttributes() || settingsupdated
@@ -743,6 +743,7 @@ idea {
module { module {
downloadJavadoc = true downloadJavadoc = true
downloadSources = true downloadSources = true
inheritOutputDirs = true
} }
project { project {
settings { settings {
+5 -6
View File
@@ -1,16 +1,15 @@
// Add your dependencies here // Add your dependencies here
dependencies { dependencies {
compile("com.github.GTNewHorizons:Mantle:0.3.4:dev") api("com.github.GTNewHorizons:Mantle:0.3.5:dev")
compile("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") api("com.github.GTNewHorizons:ForgeMultipart:1.3.1:dev")
compile("com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev") implementation("com.github.GTNewHorizons:NotEnoughItems:2.3.26-GTNH:dev")
compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.5.13:api") compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.5.13:api")
compileOnly("com.github.GTNewHorizons:waila:1.5.20:api") compileOnly("com.github.GTNewHorizons:waila:1.5.20:api")
compileOnly("com.github.GTNewHorizons:Battlegear2:master-SNAPSHOT:api") { compileOnly("com.github.GTNewHorizons:Battlegear2:1.1.2.3:api") {
transitive = false transitive = false
} }
compile("curse.maven:cofh-core-69162:2388751") implementation("curse.maven:cofh-core-69162:2388751")
compileOnly("curse.maven:minefactory-reloaded-66672:2366150") compileOnly("curse.maven:minefactory-reloaded-66672:2366150")
compileOnly("curse.maven:zelda-sword-skills-220540:2384889") compileOnly("curse.maven:zelda-sword-skills-220540:2384889")
compileOnly("curse.maven:dynamic-sword-skills-226360:2495462") compileOnly("curse.maven:dynamic-sword-skills-226360:2495462")
+47
View File
@@ -58,3 +58,50 @@ containsMixinsAndOrCoreModOnly = false
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your # 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. # responsibility check the licence and request permission for distribution, if required.
usesShadowedDependencies = false usesShadowedDependencies = false
# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories
includeWellKnownRepositories = true
# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
# The project's ID on Modrinth. Can be either the slug or the ID.
# Leave this empty if you don't want to publish on Modrinth.
modrinthProjectId =
# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
# Syntax: scope1-type1:name1;scope2-type2:name2;...
# Where scope can be one of [required, optional, incompatible, embedded],
# 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: 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.
# The project's numeric ID on CurseForge. You can find this in the About Project box.
# Leave this empty if you don't want to publish on CurseForge.
curseForgeProjectId =
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
# Syntax: type1:name1;type2:name2;...
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
# and the name is the CurseForge project slug of the other mod.
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
curseForgeRelations =
# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
# projects. New projects should not use this parameter.
# customArchiveBaseName =
# Optional parameter to prevent the source code from being published
# noPublishedSources =
# Uncomment this to disable spotless checks
# This should only be uncommented to keep it easier to sync with upstream/other forks.
# That is, if there is no other active fork/upstream, NEVER change this.
# disableSpotless = true
-10
View File
@@ -1,14 +1,4 @@
// Add any additional repositiroes for your dependencies here // Add any additional repositiroes for your dependencies here
repositories { repositories {
maven {
name = "GTNH Maven"
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
}
maven {
url "https://cursemaven.com"
}
maven {
url = "https://jitpack.io"
}
} }
@@ -16,7 +16,7 @@ public class CraftingStationStackPositioner implements IStackPositioner {
public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> stacks) { public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> stacks) {
if (Minecraft.getMinecraft().currentScreen instanceof GuiRecipe) { if (Minecraft.getMinecraft().currentScreen instanceof GuiRecipe) {
GuiRecipe recipeGui = (GuiRecipe) Minecraft.getMinecraft().currentScreen; GuiRecipe<?> recipeGui = (GuiRecipe<?>) Minecraft.getMinecraft().currentScreen;
if (!(recipeGui.firstGui instanceof CraftingStationGui)) { if (!(recipeGui.firstGui instanceof CraftingStationGui)) {
TConstruct.logger.warn("No CraftingStationGui found!"); TConstruct.logger.warn("No CraftingStationGui found!");
@@ -92,7 +92,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler {
} }
@Override @Override
public List<String> handleTooltip(GuiRecipe guiRecipe, List<String> currenttip, int recipe) { public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
super.handleTooltip(guiRecipe, currenttip, recipe); super.handleTooltip(guiRecipe, currenttip, recipe);
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
if (GuiContainerManager.shouldShowTooltip(guiRecipe)) { if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
@@ -112,7 +112,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler {
} }
@Override @Override
public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) { public boolean keyTyped(GuiRecipe<?> gui, char keyChar, int keyCode, int recipe) {
if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) { if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) {
if (this.transferFluidTank(gui, recipe, false)) { if (this.transferFluidTank(gui, recipe, false)) {
return true; return true;
@@ -126,7 +126,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler {
} }
@Override @Override
public boolean mouseClicked(GuiRecipe gui, int button, int recipe) { public boolean mouseClicked(GuiRecipe<?> gui, int button, int recipe) {
if (button == 0) { if (button == 0) {
if (this.transferFluidTank(gui, recipe, false)) { if (this.transferFluidTank(gui, recipe, false)) {
return true; return true;
@@ -139,7 +139,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler {
return super.mouseClicked(gui, button, recipe); return super.mouseClicked(gui, button, recipe);
} }
protected boolean transferFluidTank(GuiRecipe guiRecipe, int recipe, boolean usage) { protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
Point mouse = GuiDraw.getMousePosition(); Point mouse = GuiDraw.getMousePosition();
Point offset = guiRecipe.getRecipePosition(recipe); Point offset = guiRecipe.getRecipePosition(recipe);
@@ -151,6 +151,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi
@Override @Override
public void setActive(boolean flag) { public void setActive(boolean flag) {
if (!active) { if (!active) {
active = true;
active = activateFaucet(); active = activateFaucet();
} else { } else {
active = false; active = false;