Compare commits

..

No commits in common. "d0501b16a2429cb65c2c04d809a3612003cf51de" and "a2dadca406ed873052c09a7710e4e32309eb388d" have entirely different histories.

6 changed files with 1708 additions and 3782 deletions

View File

@ -1,9 +1,3 @@
v2.18v
* Removed minor nuclear wasteland biome decorators causing crash
* Updated Chinese language file [thanks to WuzgXY and team!]
v2.18u v2.18u
* Removed fluid auto-pushing from machine interfaces as connected machines would not update properly * Removed fluid auto-pushing from machine interfaces as connected machines would not update properly

View File

@ -1,7 +1,7 @@
mc_version=1.12.2 mc_version=1.12.2
forge_version=14.23.5.2838 forge_version=14.23.5.2838
mapping_version=stable_39 mapping_version=stable_39
mod_version=2.18v mod_version=2.18u
ic2_version=2.8.197-ex112 ic2_version=2.8.197-ex112
jei_version=4.15.0.293 jei_version=4.15.0.293

View File

@ -107,7 +107,7 @@ public class BiomeDecoratorNuclearWasteland extends BiomeDecorator {
generateGrass(worldIn, biomeIn, random, chunkPos); generateGrass(worldIn, biomeIn, random, chunkPos);
if (generateFalls) { if (generateFalls) {
// generateFalls(worldIn, random, chunkPos); Disabling due to weird crash. generateFalls(worldIn, random, chunkPos);
} }
MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(worldIn, random, chunkPos)); MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(worldIn, random, chunkPos));
} }

View File

@ -23,10 +23,13 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class BiomeNuclearWasteland extends Biome { public class BiomeNuclearWasteland extends Biome {
public static final String BIOME_REGISTRY_NAME = "nuclear_wasteland";
public static final String BIOME_NAME = "Nuclear Wasteland";
protected static final IBlockState BEDROCK = Blocks.BEDROCK.getDefaultState(); protected static final IBlockState BEDROCK = Blocks.BEDROCK.getDefaultState();
public BiomeNuclearWasteland() { public BiomeNuclearWasteland() {
super(new BiomeProperties("Nuclear Wasteland").setBaseHeight(0.12F).setHeightVariation(0.02F).setTemperature(2F).setWaterColor(0x994C00).setRainDisabled()); super(new BiomeProperties(BIOME_NAME).setBaseHeight(0.12F).setHeightVariation(0.02F).setTemperature(2F).setWaterColor(0x994C00).setRainDisabled());
topBlock = NCBlocks.dry_earth.getDefaultState(); topBlock = NCBlocks.dry_earth.getDefaultState();
fillerBlock = Blocks.SAND.getDefaultState(); fillerBlock = Blocks.SAND.getDefaultState();

View File

@ -23,7 +23,7 @@ public class NCBiomes {
@SubscribeEvent @SubscribeEvent
public static void onEvent(final RegistryEvent.Register<Biome> event) { public static void onEvent(final RegistryEvent.Register<Biome> event) {
final IForgeRegistry<Biome> registry = event.getRegistry(); final IForgeRegistry<Biome> registry = event.getRegistry();
registry.register(NUCLEAR_WASTELAND.setRegistryName(Global.MOD_ID, "nuclear_wasteland")); registry.register(new BiomeNuclearWasteland().setRegistryName(Global.MOD_ID, BiomeNuclearWasteland.BIOME_REGISTRY_NAME));
} }
} }

File diff suppressed because it is too large Load Diff