Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Dec 8, 2024
1 parent c7731da commit 65b4fb4
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 28 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
23 changes: 11 additions & 12 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -71,9 +71,8 @@ goto fail
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar



@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain --build-cache %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/reobf/proghatches/ae/PartStockingExportBus.java
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,13 @@ public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
if (!this.getProxy().isActive() || !this.canDoBusWork()) {
return TickRateModulation.IDLE;
}
try {
end: try {
final InventoryAdaptor destination = this.getHandler();
final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getItemInventory();

final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getItemInventory();
final IEnergyGrid energy = this.getProxy().getEnergy();
didSomething=false;

if(destination==null)break end;


IMEMonitor<IAEItemStack> iinv = getProxy().getStorage().getItemInventory();
Expand All @@ -268,9 +269,9 @@ public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)

}

} catch (GridAccessException e) {
//bruh
} catch (GridAccessException e) {}
catch (Exception e) {e.printStackTrace();

}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,13 @@ public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
if (!this.getProxy().isActive() || !this.canDoBusWork()) {
return TickRateModulation.IDLE;
}
try {
end: try {
final IFluidHandler te = this.getHandler();

final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getFluidInventory();
final IEnergyGrid energy = this.getProxy().getEnergy();
didSomething=false;

if(te==null)break end;


IMEMonitor<IAEFluidStack> iinv = getProxy().getStorage().getFluidInventory();
Expand All @@ -253,9 +254,10 @@ public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
}


} catch (GridAccessException e) {
//bruh
}
} catch (GridAccessException e) {}
catch (Exception e) {e.printStackTrace();

}



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.relauncher.FMLLaunchHandler;
import reobf.proghatches.Tags;
import reobf.proghatches.main.MyMod;

import com.google.common.collect.ImmutableMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package reobf.proghatches.main.mixin.mixins.part2;

import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -56,9 +58,18 @@ public class MixinPresetsInject {

};



@Inject(method="/^(?!$)reload/",at = { @At(value="HEAD") }) private void a(CallbackInfo C)
private static List<Object> temp=new ArrayList<>();
@Inject(method="load",at = { @At(value="RETURN") }) private static void b(CallbackInfo C)
{
try{
Class<?> c=Class.forName("codechicken.nei.PresetsList");
Collection m=(Collection) c.getDeclaredField("presets").get(null);
m.removeAll(temp);
temp.clear();

}catch(Exception e){}
}
@Inject(method="load",at = { @At(value="HEAD") }) private static void a(CallbackInfo C)
{

try {
Expand All @@ -74,6 +85,7 @@ public class MixinPresetsInject {
o.getClass().getDeclaredField("mode").set(o,
Class.forName("codechicken.nei.PresetsList$PresetMode").getDeclaredField("GROUP").get(null)
);
temp.add(o);
m.add(o);
} catch (Exception e) {
e.printStackTrace();
Expand Down

0 comments on commit 65b4fb4

Please sign in to comment.