Skip to content

Commit

Permalink
fixed an anvil thing
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoriusT committed Mar 23, 2024
1 parent 65cb514 commit f19e4b4
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 40 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
[FIXED] A bunch of Bugs related to saving and loading Worlds, in regards to GT6 Specific Data.
[FIXED] Some Bug with Bukkit/Cauldron/etc. where things like Mini Portals and Ender Garbage Bins did not work correctly because of certain Events being thrown with weird Paths, triggering "loaded a different Save File" detection, which for Servers should flat out not be possible in the first place.
[FIXED] Rivers, Lakes, Oceans and Beaches do no longer dry placed Grass Bales.
[FIXED] Air vents were collecting Air even whe nsubmerged in Liquids or other Gasses.
[FIXED] Air vents were collecting Air even when submerged in Liquids or other Gasses.
[CHANGED] Roasters of higher Tiers no longer have overclocking penalty.
[CHANGED] Zirconium now has durability and speed identical to Diamonds.

Expand Down
12 changes: 9 additions & 3 deletions src/main/java/gregapi/oredict/OreDictMaterialCondition.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2021 GregTech-6 Team
* Copyright (c) 2024 GregTech-6 Team
*
* This file is part of GregTech.
*
Expand All @@ -19,10 +19,10 @@

package gregapi.oredict;

import static gregapi.data.CS.*;

import gregapi.code.ICondition;

import static gregapi.data.CS.U;

/**
* @author Gregorius Techneticies
*
Expand All @@ -31,6 +31,7 @@
public class OreDictMaterialCondition {
public static ICondition<OreDictMaterial> selfcrush() {return SelfCrush.INSTANCE;}
public static ICondition<OreDictMaterial> fullpulver() {return FullPulver.INSTANCE;}
public static ICondition<OreDictMaterial> selfforge() {return SelfForge.INSTANCE;}
public static ICondition<OreDictMaterial> fullforge() {return FullForge.INSTANCE;}
public static ICondition<OreDictMaterial> meltmin (long aMeltingPoint) {return new MeltingPointMin(aMeltingPoint);}
public static ICondition<OreDictMaterial> meltmax (long aMeltingPoint) {return new MeltingPointMax(aMeltingPoint);}
Expand All @@ -53,6 +54,11 @@ private static class FullPulver implements ICondition<OreDictMaterial> {
@Override public boolean isTrue(OreDictMaterial aMaterial) {return aMaterial.mTargetPulver.mAmount >= U;}
}

private static class SelfForge implements ICondition<OreDictMaterial> {
public static final SelfForge INSTANCE = new SelfForge();
@Override public boolean isTrue(OreDictMaterial aMaterial) {return aMaterial.mTargetForging.mMaterial == aMaterial;}
}

private static class FullForge implements ICondition<OreDictMaterial> {
public static final FullForge INSTANCE = new FullForge();
@Override public boolean isTrue(OreDictMaterial aMaterial) {return aMaterial.mTargetForging.mAmount >= U;}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/GT6_Main.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023 GregTech-6 Team
* Copyright (c) 2024 GregTech-6 Team
*
* This file is part of GregTech.
*
Expand Down Expand Up @@ -112,7 +112,7 @@ public void onModPreInit2(FMLPreInitializationEvent aEvent) {
gt_proxy.mDisableVanillaOres = ConfigsGT.GREGTECH.get("general", "DisableVanillaOres" , T);
gt_proxy.mDisableVanillaLakes = ConfigsGT.GREGTECH.get("general", "DisableVanillaLakes" , T);
mDisableIC2Ores = ConfigsGT.GREGTECH.get("general", "DisableIC2Ores" , T);
BlockOcean.SPREAD_TO_AIR = ConfigsGT.GREGTECH.get("general", "OceanBlocksSpreadToAir", T);
BlockOcean.SPREAD_TO_AIR = ConfigsGT.GREGTECH.get("general", "OceanBlocksSpreadToAir", F);
BlockOcean.FLOWS_OUT = ConfigsGT.GREGTECH.get("general", "OceanBlocksFlowOutFar" , F);
BlockSwamp.FLOWS_OUT = ConfigsGT.GREGTECH.get("general", "SwampBlocksFlowOutFar" , F);
BlockRiver.FLOWS_OUT = ConfigsGT.GREGTECH.get("general", "RiverBlocksFlowOutFar" , F);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/blocks/fluids/BlockOcean.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* @author Gregorius Techneticies
*/
public class BlockOcean extends BlockWaterlike {
public static boolean PLACEMENT_ALLOWED = F, FLOWS_OUT = T, SPREAD_TO_AIR = T, UPDATE_TICK = T;
public static boolean PLACEMENT_ALLOWED = F, FLOWS_OUT = T, SPREAD_TO_AIR = F, UPDATE_TICK = T;

public BlockOcean(String aName, Fluid aFluid) {
super(aName, aFluid, FLOWS_OUT, T);
Expand Down
Loading

0 comments on commit f19e4b4

Please sign in to comment.