Skip to content

Commit

Permalink
Fixed all instance of biome.getName() that were called on Server Side.
Browse files Browse the repository at this point in the history
  • Loading branch information
gottsch committed Aug 20, 2019
1 parent 3ef2643 commit 7dc7765
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Treasure2-1.12.2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mod_name=Treasure2
package_group=someguyssoftware.treasure2
# user alpha, beta, or v (for version)
mod_version_type=v
mod_version=1.5.0
mod_version=1.5.1

#versions
mc_version=1.12.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public class Treasure extends AbstractMod {
// constants
public static final String MODID = "treasure2";
protected static final String NAME = "Treasure2";
protected static final String VERSION = "1.5.0";
protected static final String VERSION = "1.5.1";
public static final String UPDATE_JSON_URL = "https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/master/Treasure2-1.12.2/update.json";

private static final String VERSION_URL = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public GottschTemplate getTemplate(World world, Random random, StructureArchetyp

List<TemplateHolder> templateHolders = Treasure.TEMPLATE_MANAGER.getTemplatesByArchetypeTypeBiomeTable().get(key, biomeID);
if (templateHolders == null || templateHolders.isEmpty()) {
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} {}", key, biome.getBiomeName());
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} [{}]:{}", key, biomeID, biome.toString());
}

TemplateHolder holder = templateHolders.get(random.nextInt(templateHolders.size()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public ITreasureGeneratorResult generate(World world, Random random, ICoords sur
Integer biomeID = Biome.getIdForBiome(biome);
List<TemplateHolder> templateHolders = Treasure.TEMPLATE_MANAGER.getTemplatesByArchetypeTypeBiomeTable().get(key, biomeID);
if (templateHolders == null || templateHolders.isEmpty()) {
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} {}", key, biome.getBiomeName());
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} [{}]:[]", key, biomeID, biome.toString());
return result.fail();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public GottschTemplate getTemplate(World world, Random random, StructureArchetyp

List<TemplateHolder> templateHolders = Treasure.TEMPLATE_MANAGER.getTemplatesByArchetypeTypeBiomeTable().get(key, biomeID);
if (templateHolders == null || templateHolders.isEmpty()) {
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} {}", key, biome.getBiomeName());
Treasure.logger.debug("could not find template holders for archetype:type, biome -> {} [{}]:{}", key, biomeID, biome.toString());
}

TemplateHolder holder = templateHolders.get(random.nextInt(templateHolders.size()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.someguyssoftware.gottschcore.meta.IMetaArchetype;
import com.someguyssoftware.gottschcore.meta.IMetaType;
import com.someguyssoftware.gottschcore.mod.IMod;
import com.someguyssoftware.gottschcore.world.WorldInfo;
import com.someguyssoftware.gottschcore.world.gen.structure.GottschTemplateManager;
import com.someguyssoftware.gottschcore.world.gen.structure.StructureMarkers;
import com.someguyssoftware.treasure2.Treasure;
Expand Down Expand Up @@ -263,9 +264,24 @@ private void mapToTemplatesByArchetypeBiome(ResourceLocation metaResourceLocatio
}
}
} else if (!meta.getBiomeBlackList().isEmpty()) {
/*
* add all the black listed biome IDs to a list
*/
List<Integer> blackListBiomeIDs = new ArrayList<>();
for (String b : meta.getBiomeBlackList()) {
Biome biome = ForgeRegistries.BIOMES.getValue(new ResourceLocation(b.trim().toLowerCase()));
if (biome != null) {
Integer biomeID = Biome.getIdForBiome(biome);
if (biomeID != null) blackListBiomeIDs.add(biomeID);
}
}
// get the set of all biomes
Set<Biome> biomes = (Set<Biome>) ForgeRegistries.BIOMES.getValuesCollection();
// TODO add black list biome ID to list, then check against the biome ID that is being being process
// for each biome is the list
for (Biome biome : biomes) {
if (!meta.getBiomeBlackList().contains(biome.getBiomeName().toLowerCase())
// if (!meta.getBiomeBlackList().contains(biome.getBiomeName().toLowerCase())
if (!blackListBiomeIDs.contains(Biome.getIdForBiome(biome))
&& !BiomeDictionary.hasType(biome, Type.END)
&& !BiomeDictionary.hasType(biome, Type.NETHER)) {
Integer biomeID = Biome.getIdForBiome(biome);
Expand Down Expand Up @@ -379,7 +395,13 @@ public void dump() {
for (Entry<Integer, List<TemplateHolder>> entry : tmp.entrySet()) {
String templateNames = entry.getValue().stream().map(a -> a.getLocation().toString()).collect(Collectors.joining(", "));
Biome biome = Biome.getBiome(entry.getKey());
String biomeName = (biome != null) ? biome.getBiomeName() : String.format("No biome for {}", entry.getKey());
String biomeName = "";
if (biome != null) {
biomeName = WorldInfo.isClientSide() ? biome.getBiomeName() : String.valueOf(Biome.getIdForBiome(biome)) ;
}
else {
biomeName = String.format("No biome for {}", entry.getKey());
}
sb.append(String.format(format2, row, biomeName, templateNames));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Treasure2-1.12.2/src/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"modid": "treasure2",
"name": "Treasure2!",
"description": "",
"version": "1.5.0",
"version": "1.5.1",
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",
Expand Down
7 changes: 4 additions & 3 deletions Treasure2-1.12.2/update.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"homepage": "https://minecraft.curseforge.com/projects/treasure2",
"promos": {
"1.12.2-latest": "1.5.0",
"1.12.2-recommended": "1.4.3"
"1.12.2-latest": "1.5.1",
"1.12.2-recommended": "1.5.1"
},
"1.12.2": {
"0.5.0": "alpha release",
Expand All @@ -26,7 +26,8 @@
"1.4.1": "Add Structures add Structure files.\nUpdate MobTrapPitGenerator to use Proximity Spawners.\nFixed World Generators map - use Enum instead of String.\nRefactor Pit selection code.\n",
"1.4.2": "Fixed DataFixer server-side crash.\nFixed AbstractChestGenerator crash.\nRemoved Structure Pit Generators that didnt make sense, ie. Big Bottom, Lava Trap.\nExpanded code when retrieving chest coords from pit structure.\n",
"1.4.3": "Fixed AbstractChestGenerator crash again -> Found edges cases that didn't return StructureInfo on Structure gens.\nFixed findUndergroundCeiling() call.\n",
"1.5.0": "Expose/Add custom structure locations.\nSet Key max uses as configurable.\nAdded Chinese language file. Thanks to qyhao.\nAdded new config options - toggle default loot table and templates enforcement.\nRemoved references to mod_present condition on loot tables.\nFix WitherRoot and WitherBranch blocks placement.\nAdded meta file system.\nAdded underwater structures.\nAdded more treasure room structures."
"1.5.0": "Expose/Add custom structure locations.\nSet Key max uses as configurable.\nAdded Chinese language file. Thanks to qyhao.\nAdded new config options - toggle default loot table and templates enforcement.\nRemoved references to mod_present condition on loot tables.\nFix WitherRoot and WitherBranch blocks placement.\nAdded meta file system.\nAdded underwater structures.\nAdded more treasure room structures.",
"1.5.1": "Fixed Server crash on load - due to biome.getName().\n"

}
}
Expand Down

0 comments on commit 7dc7765

Please sign in to comment.