Skip to content

More cleanups #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 29, 2017
Merged

More cleanups #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9ec05f
Remove last vestiges of OreSpawn 1 interfacing and clean up unused im…
dshadowwolf Jun 29, 2017
7424573
Fix crash with fake players
dshadowwolf Jun 29, 2017
8f3a0f5
Merge branch 'master-1.11.2-dev' of github.com:MinecraftModDevelopmen…
dshadowwolf Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/mcmoddev/nethermetals/NetherMetals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ public static boolean hasBaseMetals() {
@SubscribeEvent
public void onBlockBreak(BlockEvent.BreakEvent event) {
boolean silk = false;
if (event.getPlayer() != null && event.getPlayer().getHeldItem(event.getPlayer().swingingHand) != null) {
NBTTagList var15 = event.getPlayer().getHeldItem(event.getPlayer().swingingHand).getEnchantmentTagList();
if (event.getPlayer() != null && event.getPlayer().getHeldItemMainhand() != null) {
NBTTagList var15 = event.getPlayer().getHeldItemMainhand().getEnchantmentTagList();
if (var15 != null) {
for (int nbttaglist3 = 0; nbttaglist3 < var15.tagCount(); ++nbttaglist3) {
short l1 = var15.getCompoundTagAt(nbttaglist3).getShort("id");
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/mcmoddev/nethermetals/init/NetherBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.mcmoddev.nethermetals.init;

import com.mcmoddev.lib.data.Names;
import com.mcmoddev.lib.init.Materials;
import com.mcmoddev.lib.material.MMDMaterial;
import com.mcmoddev.nethermetals.NetherMetals;
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/mcmoddev/nethermetals/util/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class Config {

private static Configuration configuration;
private static final String CONFIG_FILE = "config/NetherMetals.cfg";
// private static final String ORESPAWN_CFG_PATH = "orespawn";
private static final String ORESPAWN = "OreSpawn";
private static final String NETHERORE = "Nether Ores";
private static final String COMPAT = "Mod Compat";
Expand Down Expand Up @@ -100,16 +99,6 @@ public static void init() {
orespawnMod.add(new DefaultArtifactVersion("1.1.0"));
throw new MissingModsException(orespawnMod, "orespawn", "MMD Ore Spawn Mod");
}
/*
final Path oreSpawnFile = Paths.get(ORESPAWN_CFG_PATH, NetherMetals.MODID + ".json");
if (!(oreSpawnFile.toFile().exists())) {
try {
Files.createDirectories(oreSpawnFile.getParent());
} catch (final IOException ex) {
//NetherMetals.logger.error("Failed to write file " + oreSpawnFile, ex);
}
}
*/
}
}

Expand Down