changed some naming

watschman / BetterEnhancement

Browse code changed some naming master
1 parent 600a77b commit f3f15b5669b567b9d5321aa424c4deea377d9006 Watschman authored on 29 Aug 2018

Patch

Showing 7 changed files

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/blocks/ModBlockBase.java
package com.watschman.betterenhancement.blocks; import com.watschman.betterenhancement.config.ConfigEntry; import com.watschman.betterenhancement.config.ConfigUtil; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import java.util.HashMap; import java.util.Map; public class ModBlockBase extends Block { private Map<String, ConfigEntry> configs = new HashMap<>(); private ModBlockBase(Material blockMaterialIn, MapColor blockMapColorIn, String name) { super(blockMaterialIn, blockMapColorIn); this.setRegistryName(Reference.MOD_ID, name); this.setUnlocalizedName(Reference.MOD_ID + '.' + name); } public static ModBlockBase createModBlockBaseObject(Material blockMaterialIn, MapColor blockMapColorIn, String name) { ModBlockBase blockObject = new ModBlockBase(blockMaterialIn, blockMapColorIn, name); blockObject.addBlockRegistration(); return blockObject; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue); return this; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment); return this; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment, String category) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment, category); return this; } public ConfigEntry getConfigEntry(String mapIdentifier) { return this.configs.get(mapIdentifier); } private void addBlockRegistration() { Reference.MOD_BLOCKS.add(this); Reference.MOD_ITEMS.add(ModItemBlockBase.createModItemBlockBaseObject(this)); } } package com.watschman.betterenhancement.blocks; import com.watschman.betterenhancement.config.ConfigEntry; import com.watschman.betterenhancement.config.ConfigUtil; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import java.util.HashMap; import java.util.Map; public class ModBlockBase extends Block { private Map<String, ConfigEntry> configs = new HashMap<>(); private ModBlockBase(Material blockMaterialIn, MapColor blockMapColorIn, String name, boolean privateBoolean) { super(blockMaterialIn, blockMapColorIn); this.setRegistryName(Reference.MOD_ID, name); this.setUnlocalizedName(Reference.MOD_ID + '.' + name); } public static ModBlockBase createBlockObject(Material blockMaterialIn, MapColor blockMapColorIn, String name) { ModBlockBase blockObject = new ModBlockBase(blockMaterialIn, blockMapColorIn, name, true); blockObject.addBlockRegistration(); return blockObject; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue); return this; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment); return this; } public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment, String category) { this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment, category); return this; } public ConfigEntry getConfigEntry(String mapIdentifier) { return this.configs.get(mapIdentifier); } private void addBlockRegistration() { Reference.MOD_BLOCKS.add(this); Reference.MOD_ITEMS.add(new ModItemBlockBase(this)); } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/blocks/ModBlockBase.java

package com.watschman.betterenhancement.blocks;

import com.watschman.betterenhancement.config.ConfigEntry;
import com.watschman.betterenhancement.config.ConfigUtil;
import com.watschman.betterenhancement.reference.Reference;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;

import java.util.HashMap;
import java.util.Map;

public class ModBlockBase extends Block {

private Map<String, ConfigEntry> configs = new HashMap<>();

private ModBlockBase(Material blockMaterialIn, MapColor blockMapColorIn, String name) {
        super(blockMaterialIn, blockMapColorIn);
        this.setRegistryName(Reference.MOD_ID, name);
        this.setUnlocalizedName(Reference.MOD_ID + '.' + name);
    }

public static ModBlockBase createModBlockBaseObject(Material blockMaterialIn, MapColor blockMapColorIn, String name) {
        ModBlockBase blockObject = new ModBlockBase(blockMaterialIn, blockMapColorIn, name);
        blockObject.addBlockRegistration();
        return blockObject;
    }

public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue) {
        this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue);
        return this;
    }

public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment) {
        this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment);
        return this;
    }

public ModBlockBase addConfigEntry(String mapIdentifier, String configIdentifier, Object defaultValue, String comment, String category) {
        this.configs = ConfigUtil.createConfigEntry(this.configs, mapIdentifier, configIdentifier, defaultValue, comment, category);
        return this;
    }

public ConfigEntry getConfigEntry(String mapIdentifier) {
        return this.configs.get(mapIdentifier);
    }

private void addBlockRegistration() {
        Reference.MOD_BLOCKS.add(this);
        Reference.MOD_ITEMS.add(ModItemBlockBase.createModItemBlockBaseObject(this));
    }
}

package com.watschman.betterenhancement.blocks;

import java.util.HashMap;
import java.util.Map;

public class ModBlockBase extends Block {

private Map<String, ConfigEntry> configs = new HashMap<>();

private ModBlockBase(Material blockMaterialIn, MapColor blockMapColorIn, String name, boolean privateBoolean) {
        super(blockMaterialIn, blockMapColorIn);
        this.setRegistryName(Reference.MOD_ID, name);
        this.setUnlocalizedName(Reference.MOD_ID + '.' + name);
    }

public static ModBlockBase createBlockObject(Material blockMaterialIn, MapColor blockMapColorIn, String name) {
        ModBlockBase blockObject = new ModBlockBase(blockMaterialIn, blockMapColorIn, name, true);
        blockObject.addBlockRegistration();
        return blockObject;
    }

public ConfigEntry getConfigEntry(String mapIdentifier) {
        return this.configs.get(mapIdentifier);
    }

private void addBlockRegistration() {
        Reference.MOD_BLOCKS.add(this);
        Reference.MOD_ITEMS.add(new ModItemBlockBase(this));
    }
}

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/blocks/ModBlocks.java
package com.watschman.betterenhancement.blocks; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraftforge.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(Reference.MOD_ID) public final class ModBlocks { public static ModBlockBase blockAntizide; public static ModBlockBase blockAntozide; public static void init() { blockAntizide = ModBlockBase.createModBlockBaseObject(Material.ROCK, MapColor.PINK, "antizide").addConfigEntry("isEnabled", "Enable Antizide", true, "Whether or not the Block should be enabled"); blockAntozide = ModBlockBase.createModBlockBaseObject(Material.ROCK, MapColor.PINK, "antozide").addConfigEntry("isEnabled", "Enable Antozide", true, "Whether or not the Block should be enabled"); } } package com.watschman.betterenhancement.blocks; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraftforge.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(Reference.MOD_ID) public final class ModBlocks { public static ModBlockBase blockAntizide; public static ModBlockBase blockAntozide; public static void init() { blockAntizide = ModBlockBase.createBlockObject(Material.ROCK, MapColor.PINK, "antizide").addConfigEntry("isEnabled", "Enable Antizide", true, "Whether or not the Block should be enabled"); blockAntozide = ModBlockBase.createBlockObject(Material.ROCK, MapColor.PINK, "antozide").addConfigEntry("isEnabled", "Enable Antozide", true, "Whether or not the Block should be enabled"); } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/blocks/ModBlocks.java

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/blocks/ModItemBlockBase.java
package com.watschman.betterenhancement.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; public class ModItemBlockBase extends ItemBlock { private ModItemBlockBase(Block block) { super(block); this.setRegistryName(block.getRegistryName()); this.setUnlocalizedName(block.getUnlocalizedName()); } public static ModItemBlockBase createModItemBlockBaseObject(Block block) { ModItemBlockBase modItemBlockBaseObject = new ModItemBlockBase(block); return modItemBlockBaseObject; } } package com.watschman.betterenhancement.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; public class ModItemBlockBase extends ItemBlock { public ModItemBlockBase(Block block) { super(block); this.setRegistryName(block.getRegistryName()); this.setUnlocalizedName(block.getUnlocalizedName()); } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/blocks/ModItemBlockBase.java

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/items/ModItemBase.java
package com.watschman.betterenhancement.items; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.item.Item; public class ModItemBase extends Item { private ModItemBase(String name) { super(); this.setRegistryName(Reference.MOD_ID); this.setUnlocalizedName(Reference.MOD_ID + '.' + name); } public static ModItemBase createModItemBaseObject(String name) { ModItemBase modItemObject = new ModItemBase(name); modItemObject.addItemRegistration(); return modItemObject; } public void addItemRegistration() { Reference.MOD_ITEMS.add(this); } } package com.watschman.betterenhancement.items; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.item.Item; public class ModItemBase extends Item { private ModItemBase(String name) { super(); this.setRegistryName(Reference.MOD_ID); this.setUnlocalizedName(Reference.MOD_ID + '.' + name); } public static ModItemBase createItemObject(String name) { ModItemBase modItemObject = new ModItemBase(name); modItemObject.addItemRegistration(); return modItemObject; } public void addItemRegistration() { Reference.MOD_ITEMS.add(this); } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/items/ModItemBase.java

Show notes View src/main/resources/assets/betterenhancement/lang/de_DE.lang 100644 → 0
# de_DE.lang - English localization file for the mod Better Enhancement # #Blocks tile.betterenhancement.antizide.name=German Antizide tile.betterenhancement.antozide.name=German Antozide

Show notes View src/main/resources/assets/betterenhancement/lang/en_US.lang 100644 → 0
# en_US.lang - English localization file for the mod Better Enhancement # #Blocks tile.betterenhancement.antizide.name=Antizide tile.betterenhancement.antozide.name=Antozide

Ignore Space Show notes View src/main/resources/assets/betterenhancement/lang/en_us.lang 0 → 100644
# en_US.lang - English localization file for the mod Better Enhancement # #Blocks tile.betterenhancement.antizide.name=Antizide tile.betterenhancement.antozide.name=Antozide

Show line notes below