Skip to content

Commit

Permalink
fix bugs, add IHeater and IHeatAccepter
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuzuanpa
kuzuanpa committed Dec 2, 2024
1 parent 9ca78b5 commit 0382968
Show file tree
Hide file tree
Showing 15 changed files with 130 additions and 95 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
minecraft_version=1.7.10
forge_version=10.13.4.1614-1.7.10
mod_version=0.81.0-TFRU
mod_version=0.81.1-TFRU
mod_id=TerraFirmaCraft
tfc_version=0.81.0-TFRU
tfc_version=0.81.1-TFRU
group_name=com.bioxx.tfc


Expand Down
2 changes: 1 addition & 1 deletion src/Common/com/bioxx/tfc/TFRUEnvHelper.java → src/API/com/bioxx/tfc/api/TFRUEnvHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bioxx.tfc;
package com.bioxx.tfc.api;

public class TFRUEnvHelper {
public static boolean isModTFRU = true;
Expand Down
6 changes: 6 additions & 0 deletions src/API/com/bioxx/tfc/api/TileEntities/IHeatAccepter.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.bioxx.tfc.api.TileEntities;

public interface IHeatAccepter {
/**@return Heat Amount consumed, in HU(gt6 unit)**/
float consumeHeat(IHeater heater);
}
6 changes: 6 additions & 0 deletions src/API/com/bioxx/tfc/api/TileEntities/IHeater.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.bioxx.tfc.api.TileEntities;

public interface IHeater {
float getCurrentTemperature();
void heat(IHeatAccepter accepter);
}
32 changes: 7 additions & 25 deletions src/API/com/bioxx/tfc/api/Util/Helper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static MovingObjectPosition getMovingObjectPositionFromPlayer(World world
*/
public static float clampFloat(float par0, float par1, float par2)
{
return par0 < par1 ? par1 : par0 > par2 ? par2 : par0;
return par0 < par1 ? par1 : Math.min(par0, par2);
}

public static float roundNumber(float input, float rounding)
Expand Down Expand Up @@ -110,16 +110,10 @@ else if(usesSRG(obj, srgName))
f = obj.getClass().getDeclaredField(obfName);
f.setAccessible(true);
return (Integer) f.get(obj);
} catch (NoSuchFieldException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (SecurityException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalArgumentException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalAccessException e) {
} catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException | SecurityException e) {
TerraFirmaCraft.LOG.catching(e);
}
return 0;
return 0;
}

public static boolean getBoolean(Object obj, String srgName, String obfName, String deobfName, boolean useDeobf)
Expand All @@ -135,16 +129,10 @@ else if(usesSRG(obj, srgName))
f = obj.getClass().getDeclaredField(obfName);
f.setAccessible(true);
return (Boolean) f.get(obj);
} catch (NoSuchFieldException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (SecurityException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalArgumentException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalAccessException e) {
} catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException | SecurityException e) {
TerraFirmaCraft.LOG.catching(e);
}
return false;
return false;
}

public static Object getObject(Object obj, String srgName, String obfName, String deobfName, boolean useDeobf)
Expand All @@ -160,15 +148,9 @@ else if(usesSRG(obj, srgName))
f = obj.getClass().getDeclaredField(obfName);
f.setAccessible(true);
return f.get(obj);
} catch (NoSuchFieldException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (SecurityException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalArgumentException e) {
TerraFirmaCraft.LOG.catching(e);
} catch (IllegalAccessException e) {
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
TerraFirmaCraft.LOG.catching(e);
}
return null;
return null;
}
}
5 changes: 3 additions & 2 deletions src/Common/com/bioxx/tfc/Blocks/Terrain/BlockOre2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ public BlockOre2(Material mat)
public void updateTick(World world, int x, int y, int z, Random rand)
{
//TODO: For old oreGen Compact, will remove at later version
if (!world.isRemote && world.getBlockMetadata(x,y,z) > 0){
((TEOre) world.getTileEntity(x, y, z)).droppedOreID = 16+world.getBlockMetadata(x,y,z);
if (!world.isRemote){
int meta = world.getBlockMetadata(x,y,z);
world.setBlock(x,y,z, TFCBlocks.ore);
world.setBlockMetadataWithNotify(x,y,z,0, 0);
((TEOre) world.getTileEntity(x, y, z)).droppedOreID = 16+meta;
}
}
}
5 changes: 3 additions & 2 deletions src/Common/com/bioxx/tfc/Blocks/Terrain/BlockOre3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ public BlockOre3(Material material)
public void updateTick(World world, int x, int y, int z, Random rand)
{
//TODO: For old oreGen Compact, will remove at later version
if (!world.isRemote && world.getBlockMetadata(x,y,z) > 0){
((TEOre) world.getTileEntity(x, y, z)).droppedOreID = 32+world.getBlockMetadata(x,y,z);
if (!world.isRemote){
int meta = world.getBlockMetadata(x,y,z);
world.setBlock(x,y,z, TFCBlocks.ore);
world.setBlockMetadataWithNotify(x,y,z,0, 0);
((TEOre) world.getTileEntity(x, y, z)).droppedOreID = 32+meta;
}
}
}
62 changes: 31 additions & 31 deletions src/Common/com/bioxx/tfc/Core/Config/TFC_ConfigFiles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,37 +487,37 @@ public static void reloadOres()
if (oresConfig == null) throw new IllegalStateException("Config reload attempt before preinit.");
TerraFirmaCraft.LOG.info("Loading TFCOres");

oreList.put("Native Copper" , getOreData("Native Copper","veins", "large", MOD_ID + ":Ore1", "tfcaths:Blood_Lily" , 1, 0, 70, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Native Gold" , getOreData("Native Gold" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Black_Eyed_Susan" , 3, 1, 70, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Platinum" , getOreData("Platinum" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Loose_Flowered_Orchid", 3, 2, 100, new String[]{"sedimentary"}, 5, 110, 20, 60));
oreList.put("Hematite" , getOreData("Hematite" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Camas_Flower" , 3, 3, 75, new String[]{"igneous extrusive"}, 5, 110, 60, 40));
oreList.put("Silver" , getOreData("Silver" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Saxifrage" , 8, 4, 50, new String[]{"sedimentary", "metamorphic"}, 5, 110, 60, 40));
oreList.put("Cassiterite" , getOreData("Cassiterite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Heather" , 4, 5, 70, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 60, 40));
oreList.put("Galena" , getOreData("Galena" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Siberian_Squill" , 3, 6, 50, new String[]{"igneous extrusive", "metamorphic", "sedimentary"}, 5, 110, 60, 40));
oreList.put("Garnierite" , getOreData("Garnierite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Aster" , 3, 8, 100, new String[]{"gabbro","basalt","diorite"}, 5, 110, 60, 40));
oreList.put("Malachite" , getOreData("Malachite" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Aloe_Vera" , 1, 9, 50, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Magnetite" , getOreData("Magnetite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Quaqua" , 1, 10, 80, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Limonite" , getOreData("Limonite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Sundew" , 1, 11, 50, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Sphalerite" , getOreData("Sphalerite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Bleeding_Hearts" , 3, 12, 50, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Tetrahedrite" , getOreData("Tetrahedrite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Anemone" , 13, 13, 70, new String[]{"metamorphic","sedimentary"}, 5, 110, 60, 40));
oreList.put("Lignite" , getOreData("Lignite" ,"default","medium", MOD_ID + ":Ore1", "tfcaths:Indigo_Pinkgills" , 0, 15, 50, new String[]{"metamorphic"}, 5, 110, 70, 20));
oreList.put("Kaolinite" , getOreData("Kaolinite" ,"default","medium", MOD_ID + ":Ore1", "tfcaths:Splendid_Waxcap" , 0, 16, 100, new String[]{"sedimentary", "metamorphic"}, 5, 110, 60, 40));
oreList.put("Gypsum" , getOreData("Gypsum" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Blazing_Star" , 3, 17, 70, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Graphite" , getOreData("Graphite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Azalea_Evergreen" , 7, 20, 100, new String[]{"metamorphic", "sedimentary"}, 5, 110, 60, 40));
oreList.put("Kimberlite" , getOreData("Kimberlite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Royal_Catchfly" , 3, 21, 150, new String[]{"gabbro","basalt","diorite"}, 5, 110, 15, 60));
oreList.put("Jet" , getOreData("Jet" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Cobra_Lily" , 3, 24, 60, new String[]{"sedimentary","igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Pitchblende" , getOreData("Pitchblende" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Fireweed" , 4, 26, 70, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Cinnabar" , getOreData("Cinnabar" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Wisteria_Tree" , 4, 27, 100, new String[]{"igneous extrusive", "metamorphic", "sedimentary"}, 5, 110, 15, 40));
oreList.put("Cryolite" , getOreData("Cryolite" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Gladiolus" , 15, 28, 50, new String[]{"granite"}, 5, 110, 60, 40));
oreList.put("Saltpeter" , getOreData("Saltpeter" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Hydrangea" , 15, 29, 70, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Sylvite" , getOreData("Sylvite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Martagon_Lily" , 15, 31, 50, new String[]{"sedimentary"}, 5, 110, 70, 20));
oreList.put("Borax" , getOreData("Borax" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Desert_Rose" , 5, 32, 70, new String[]{"rock salt", "limestone"}, 5, 110, 60, 40));
oreList.put("Lapis Lazuli" , getOreData("Lapis Lazuli" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Pinedrops" , 3, 34, 70, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Selenite" , getOreData("Selenite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Azalea_Evergreen" , 6, 19, 75, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 40, 40));
oreList.put("Olivine" , getOreData("Olivine" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Iris" , 3, 33, 140, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 20, 60));
oreList.put("Microcline" , getOreData("Microcline" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Jian_Chun_Luo" , 2, 25, 60, new String[]{"sedimentary"}, 5, 110, 40, 40));
oreList.put("Bismuthinite" , getOreData("Bismuthinite" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Jade_Plant" , 2, 7, 100, new String[]{"igneous extrusive", "sedimentary"}, 5, 110, 30, 30));
oreList.put("Satinspar" , getOreData("Satinspar" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Coleus" , 1, 18, 50, new String[]{"sedimentary"}, 5, 110, 15, 50));
oreList.put("Native Copper" , getOreData("Native Copper","veins", "large", MOD_ID + ":Ore1", "tfcaths:Blood_Lily" , 1, 0, 140, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Native Gold" , getOreData("Native Gold" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Black_Eyed_Susan" , 3, 1, 140, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Platinum" , getOreData("Platinum" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Loose_Flowered_Orchid", 3, 2, 200, new String[]{"sedimentary"}, 5, 110, 20, 60));
oreList.put("Hematite" , getOreData("Hematite" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Camas_Flower" , 3, 3, 150, new String[]{"igneous extrusive"}, 5, 110, 60, 40));
oreList.put("Silver" , getOreData("Silver" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Saxifrage" , 8, 4, 100, new String[]{"sedimentary", "metamorphic"}, 5, 110, 60, 40));
oreList.put("Cassiterite" , getOreData("Cassiterite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Heather" , 4, 5, 140, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 60, 40));
oreList.put("Galena" , getOreData("Galena" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Siberian_Squill" , 3, 6, 100, new String[]{"igneous extrusive", "metamorphic", "sedimentary"}, 5, 110, 60, 40));
oreList.put("Garnierite" , getOreData("Garnierite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Aster" , 3, 8, 200, new String[]{"gabbro","basalt","diorite"}, 5, 110, 60, 40));
oreList.put("Malachite" , getOreData("Malachite" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Aloe_Vera" , 1, 9, 100, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Magnetite" , getOreData("Magnetite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Quaqua" , 1, 10, 160, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Limonite" , getOreData("Limonite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Sundew" , 1, 11, 100, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Sphalerite" , getOreData("Sphalerite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Bleeding_Hearts" , 3, 12, 100, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Tetrahedrite" , getOreData("Tetrahedrite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Anemone" , 13, 13, 140, new String[]{"metamorphic","sedimentary"}, 5, 110, 60, 40));
oreList.put("Lignite" , getOreData("Lignite" ,"default","medium", MOD_ID + ":Ore1", "tfcaths:Indigo_Pinkgills" , 0, 15, 100, new String[]{"metamorphic"}, 5, 110, 70, 20));
oreList.put("Kaolinite" , getOreData("Kaolinite" ,"default","medium", MOD_ID + ":Ore1", "tfcaths:Splendid_Waxcap" , 0, 16, 200, new String[]{"sedimentary", "metamorphic"}, 5, 110, 60, 40));
oreList.put("Gypsum" , getOreData("Gypsum" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Blazing_Star" , 3, 17, 140, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Graphite" , getOreData("Graphite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Azalea_Evergreen" , 7, 20, 200, new String[]{"metamorphic", "sedimentary"}, 5, 110, 60, 40));
oreList.put("Kimberlite" , getOreData("Kimberlite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Royal_Catchfly" , 3, 21, 300, new String[]{"gabbro","basalt","diorite"}, 5, 110, 15, 60));
oreList.put("Jet" , getOreData("Jet" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Cobra_Lily" , 3, 24, 120, new String[]{"sedimentary","igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Pitchblende" , getOreData("Pitchblende" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Fireweed" , 4, 26, 140, new String[]{"igneous extrusive", "igneous intrusive"}, 5, 110, 60, 40));
oreList.put("Cinnabar" , getOreData("Cinnabar" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Wisteria_Tree" , 4, 27, 200, new String[]{"igneous extrusive", "metamorphic", "sedimentary"}, 5, 110, 15, 40));
oreList.put("Cryolite" , getOreData("Cryolite" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Gladiolus" , 15, 28, 100, new String[]{"granite"}, 5, 110, 60, 40));
oreList.put("Saltpeter" , getOreData("Saltpeter" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Hydrangea" , 15, 29, 140, new String[]{"sedimentary"}, 5, 110, 60, 40));
oreList.put("Sylvite" , getOreData("Sylvite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Martagon_Lily" , 15, 31, 100, new String[]{"sedimentary"}, 5, 110, 70, 20));
oreList.put("Borax" , getOreData("Borax" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Desert_Rose" , 5, 32, 140, new String[]{"rock salt", "limestone"}, 5, 110, 60, 40));
oreList.put("Lapis Lazuli" , getOreData("Lapis Lazuli" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Pinedrops" , 3, 34, 140, new String[]{"metamorphic"}, 5, 110, 60, 40));
oreList.put("Selenite" , getOreData("Selenite" ,"veins", "medium", MOD_ID + ":Ore1", "tfcaths:Azalea_Evergreen" , 6, 19, 150, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 40, 40));
oreList.put("Olivine" , getOreData("Olivine" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Iris" , 3, 33, 280, new String[]{"igneous intrusive", "igneous extrusive"}, 5, 110, 20, 60));
oreList.put("Microcline" , getOreData("Microcline" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Jian_Chun_Luo" , 2, 25, 120, new String[]{"sedimentary"}, 5, 110, 40, 40));
oreList.put("Bismuthinite" , getOreData("Bismuthinite" ,"veins", "small", MOD_ID + ":Ore1", "tfcaths:Jade_Plant" , 2, 7, 200, new String[]{"igneous extrusive", "sedimentary"}, 5, 110, 30, 30));
oreList.put("Satinspar" , getOreData("Satinspar" ,"veins", "large", MOD_ID + ":Ore1", "tfcaths:Coleus" , 1, 18, 100, new String[]{"sedimentary"}, 5, 110, 15, 50));


//Surface Ore
Expand Down
4 changes: 1 addition & 3 deletions src/Common/com/bioxx/tfc/Core/Recipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.util.List;
import java.util.Random;

import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import eu.usrv.yamcore.auxiliary.ItemDescriptor;
import net.minecraft.init.Blocks;
Expand Down Expand Up @@ -31,10 +30,9 @@
import com.bioxx.tfc.api.Constant.Global;
import com.bioxx.tfc.api.Crafting.*;
import com.bioxx.tfc.api.Enums.RuleEnum;
import org.apache.logging.log4j.Level;
import vazkii.botania.common.lib.LibOreDict;

import static com.bioxx.tfc.TFRUEnvHelper.isInTFRU;
import static com.bioxx.tfc.api.TFRUEnvHelper.isInTFRU;

public class Recipes
{
Expand Down
Loading

0 comments on commit 0382968

Please sign in to comment.