Pull requests - watschman/BetterEnhancement

GitBucket 4.23.1

watschman / BetterEnhancement

...

2 commits

8 files changed

0 commit comments

1 contributor

Commits on 2018-08-29

Watschman	Entity Start	de88cfb
Watschman	Changed lang file to lowercase	236e320

Patch

Showing 8 changed files

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/BetterEnhancement.java
package com.watschman.betterenhancement; import com.watschman.betterenhancement.blocks.ModBlockBase; import com.watschman.betterenhancement.blocks.ModBlocks; import com.watschman.betterenhancement.config.ConfigUtil; import com.watschman.betterenhancement.config.ConfigurationHandler; import com.watschman.betterenhancement.entities.ModEntities; import com.watschman.betterenhancement.items.ModItems; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.registry.EntityEntry; import static com.watschman.betterenhancement.reference.Reference.; @Mod(modid = MOD_ID, name = MOD_NAME, version = VERSION) public class BetterEnhancement { /* * This is the instance of your mod as created by Forge. It will never be null. / @Mod.Instance(MOD_ID) public static BetterEnhancement INSTANCE; /* * This is the first initialization event. Register tile entities here. * The registry events below will have fired prior to entry to this method. / @Mod.EventHandler public void preinit(FMLPreInitializationEvent event) { MOD_LOGGER = event.getModLog(); MOD_LOGGER.info("Beginning PreInitialization Event..."); MinecraftForge.EVENT_BUS.register(Reference.CONFIG_INSTANCE); CONFIG_INSTANCE.init(event.getSuggestedConfigurationFile()); MOD_LOGGER.info("Ending PreInitialization Event..."); } /* * This is the second initialization event. Register custom recipes / @Mod.EventHandler public void init(FMLInitializationEvent event) { MOD_LOGGER.info("Beginning Initialization Event..."); MOD_LOGGER.info("Ending Initialization Event..."); } /* * This is the final initialization event. Register actions from other mods here / @Mod.EventHandler public void postinit(FMLPostInitializationEvent event) { MOD_LOGGER.info("Beginning PostInitialization Event..."); CONFIG_INSTANCE.checkForChange(); MOD_LOGGER.info("Ending PostInitialization Event..."); } /* * This is a special class that listens to registry events, to allow creation of mod blocks and items at the proper time. / @Mod.EventBusSubscriber public static class ObjectRegistryHandler { /* * Listen for the register event for creating custom items / @SubscribeEvent public static void addItems(RegistryEvent.Register<Item> event) { MOD_LOGGER.info("Starting Item Registering Event..."); ModItems.init(); for(Item item : Reference.MOD_ITEMS) { MOD_LOGGER.info("Registering Item: " + item.getRegistryName()); event.getRegistry().register(item); } MOD_LOGGER.info("Ending Item Registering Event..."); } /* * Listen for the register event for creating custom blocks / @SubscribeEvent public static void addBlocks(RegistryEvent.Register<Block> event) { MOD_LOGGER.info("Starting Block Registering Event..."); ModBlocks.init(); for(Block block : Reference.MOD_BLOCKS) { MOD_LOGGER.info("Registering Block: " + block.getRegistryName()); if(block instanceof ModBlockBase) { if(((ModBlockBase) block).getConfigEntry("isEnabled") != null) { MOD_LOGGER.info("I am " + ConfigUtil.getPrimitiveBoolean(((ModBlockBase) block).getConfigEntry("isEnabled").getCurrentValue())); } } event.getRegistry().register(block); } MOD_LOGGER.info("Ending Block Registering Event..."); } @SubscribeEvent public static void addEntities(RegistryEvent.Register<EntityEntry> event) { MOD_LOGGER.info("Starting EntityEntry Registering Event..."); ModEntities.init(); for(EntityEntry entityEntry : Reference.MOD_ENTITIES) { event.getRegistry().register(entityEntry); } MOD_LOGGER.info("Ending EntityEntry Registering Event..."); } } } package com.watschman.betterenhancement; import com.watschman.betterenhancement.blocks.ModBlockBase; import com.watschman.betterenhancement.blocks.ModBlocks; import com.watschman.betterenhancement.config.ConfigUtil; import com.watschman.betterenhancement.config.ConfigurationHandler; import com.watschman.betterenhancement.items.ModItems; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.RegistryEvent; import static com.watschman.betterenhancement.reference.Reference.; @Mod(modid = MOD_ID, name = MOD_NAME, version = VERSION) public class BetterEnhancement { /** * This is the instance of your mod as created by Forge. It will never be null. / @Mod.Instance(MOD_ID) public static BetterEnhancement INSTANCE; /* * This is the first initialization event. Register tile entities here. * The registry events below will have fired prior to entry to this method. / @Mod.EventHandler public void preinit(FMLPreInitializationEvent event) { MOD_LOGGER = event.getModLog(); MOD_LOGGER.info("Beginning PreInitialization Event..."); MinecraftForge.EVENT_BUS.register(Reference.CONFIG_INSTANCE); CONFIG_INSTANCE.init(event.getSuggestedConfigurationFile()); MOD_LOGGER.info("Ending PreInitialization Event..."); } /* * This is the second initialization event. Register custom recipes / @Mod.EventHandler public void init(FMLInitializationEvent event) { MOD_LOGGER.info("Beginning Initialization Event..."); MOD_LOGGER.info("Ending Initialization Event..."); } /* * This is the final initialization event. Register actions from other mods here / @Mod.EventHandler public void postinit(FMLPostInitializationEvent event) { MOD_LOGGER.info("Beginning PostInitialization Event..."); CONFIG_INSTANCE.checkForChange(); MOD_LOGGER.info("Ending PostInitialization Event..."); } /* * This is a special class that listens to registry events, to allow creation of mod blocks and items at the proper time. / @Mod.EventBusSubscriber public static class ObjectRegistryHandler { /* * Listen for the register event for creating custom items / @SubscribeEvent public static void addItems(RegistryEvent.Register<Item> event) { MOD_LOGGER.info("Starting Item Registering Event..."); ModItems.init(); for(Item item : Reference.MOD_ITEMS) { MOD_LOGGER.info("Registering Item: " + item.getRegistryName()); event.getRegistry().register(item); } MOD_LOGGER.info("Ending Item Registering Event..."); } /* * Listen for the register event for creating custom blocks */ @SubscribeEvent public static void addBlocks(RegistryEvent.Register<Block> event) { MOD_LOGGER.info("Starting Block Registering Event..."); ModBlocks.init(); for(Block block : Reference.MOD_BLOCKS) { MOD_LOGGER.info("Registering Block: " + block.getRegistryName()); if(block instanceof ModBlockBase) { if(((ModBlockBase) block).getConfigEntry("isEnabled") != null) { MOD_LOGGER.info("I am " + ConfigUtil.getPrimitiveBoolean(((ModBlockBase) block).getConfigEntry("isEnabled").getCurrentValue())); } } event.getRegistry().register(block); } MOD_LOGGER.info("Ending Block Registering Event..."); } } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/BetterEnhancement.java

package com.watschman.betterenhancement;

import com.watschman.betterenhancement.blocks.ModBlockBase;
import com.watschman.betterenhancement.blocks.ModBlocks;
import com.watschman.betterenhancement.config.ConfigUtil;
import com.watschman.betterenhancement.config.ConfigurationHandler;
import com.watschman.betterenhancement.entities.ModEntities;
import com.watschman.betterenhancement.items.ModItems;
import com.watschman.betterenhancement.reference.Reference;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.registry.EntityEntry;

import static com.watschman.betterenhancement.reference.Reference.*;

@Mod(modid = MOD_ID, name = MOD_NAME, version = VERSION)
public class BetterEnhancement {

/**
     * This is the instance of your mod as created by Forge. It will never be null.
     */
    @Mod.Instance(MOD_ID)
    public static BetterEnhancement INSTANCE;

/**
     * This is the first initialization event. Register tile entities here.
     * The registry events below will have fired prior to entry to this method.
     */
    @Mod.EventHandler
    public void preinit(FMLPreInitializationEvent event) {
        MOD_LOGGER = event.getModLog();

MOD_LOGGER.info("Beginning PreInitialization Event...");

MinecraftForge.EVENT_BUS.register(Reference.CONFIG_INSTANCE);

CONFIG_INSTANCE.init(event.getSuggestedConfigurationFile());

MOD_LOGGER.info("Ending PreInitialization Event...");
    }

/**
     * This is the second initialization event. Register custom recipes
     */
    @Mod.EventHandler
    public void init(FMLInitializationEvent event) {
        MOD_LOGGER.info("Beginning Initialization Event...");

MOD_LOGGER.info("Ending Initialization Event...");
    }

/**
     * This is the final initialization event. Register actions from other mods here
     */
    @Mod.EventHandler
    public void postinit(FMLPostInitializationEvent event) {
        MOD_LOGGER.info("Beginning PostInitialization Event...");
        CONFIG_INSTANCE.checkForChange();

MOD_LOGGER.info("Ending PostInitialization Event...");
    }

/**
     * This is a special class that listens to registry events, to allow creation of mod blocks and items at the proper time.
     */
    @Mod.EventBusSubscriber
    public static class ObjectRegistryHandler {
        /**
         * Listen for the register event for creating custom items
         */
        @SubscribeEvent
        public static void addItems(RegistryEvent.Register<Item> event) {
            MOD_LOGGER.info("Starting Item Registering Event...");

ModItems.init();

for(Item item : Reference.MOD_ITEMS) {
                MOD_LOGGER.info("Registering Item: " + item.getRegistryName());
                event.getRegistry().register(item);
            }

MOD_LOGGER.info("Ending Item Registering Event...");
        }

/**
         * Listen for the register event for creating custom blocks
         */
        @SubscribeEvent
        public static void addBlocks(RegistryEvent.Register<Block> event) {
            MOD_LOGGER.info("Starting Block Registering Event...");

ModBlocks.init();

for(Block block : Reference.MOD_BLOCKS) {
                MOD_LOGGER.info("Registering Block: " + block.getRegistryName());
                if(block instanceof ModBlockBase) {
                    if(((ModBlockBase) block).getConfigEntry("isEnabled") != null) {
                        MOD_LOGGER.info("I am " + ConfigUtil.getPrimitiveBoolean(((ModBlockBase) block).getConfigEntry("isEnabled").getCurrentValue()));
                    }
                }
                event.getRegistry().register(block);
            }

MOD_LOGGER.info("Ending Block Registering Event...");
        }

@SubscribeEvent
        public static void addEntities(RegistryEvent.Register<EntityEntry> event) {
            MOD_LOGGER.info("Starting EntityEntry Registering Event...");

ModEntities.init();

for(EntityEntry entityEntry : Reference.MOD_ENTITIES) {
                event.getRegistry().register(entityEntry);
            }

MOD_LOGGER.info("Ending EntityEntry Registering Event...");
        }
    }
}

package com.watschman.betterenhancement;

import com.watschman.betterenhancement.blocks.ModBlockBase;
import com.watschman.betterenhancement.blocks.ModBlocks;
import com.watschman.betterenhancement.config.ConfigUtil;
import com.watschman.betterenhancement.config.ConfigurationHandler;
import com.watschman.betterenhancement.items.ModItems;
import com.watschman.betterenhancement.reference.Reference;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.RegistryEvent;

import static com.watschman.betterenhancement.reference.Reference.*;

@Mod(modid = MOD_ID, name = MOD_NAME, version = VERSION)
public class BetterEnhancement {

/**
     * This is the instance of your mod as created by Forge. It will never be null.
     */
    @Mod.Instance(MOD_ID)
    public static BetterEnhancement INSTANCE;

MOD_LOGGER.info("Beginning PreInitialization Event...");

MinecraftForge.EVENT_BUS.register(Reference.CONFIG_INSTANCE);

CONFIG_INSTANCE.init(event.getSuggestedConfigurationFile());

MOD_LOGGER.info("Ending PreInitialization Event...");
    }

MOD_LOGGER.info("Ending Initialization Event...");
    }

MOD_LOGGER.info("Ending PostInitialization Event...");
    }

ModItems.init();

for(Item item : Reference.MOD_ITEMS) {
                MOD_LOGGER.info("Registering Item: " + item.getRegistryName());
                event.getRegistry().register(item);
            }

MOD_LOGGER.info("Ending Item Registering Event...");
        }

ModBlocks.init();

MOD_LOGGER.info("Ending Block Registering Event...");
        }
    }
}

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/entities/EntityTrain.java 0 → 100644
package com.watschman.betterenhancement.entities; import com.watschman.betterenhancement.reference.Reference; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.world.World; public class EntityTrain extends EntityMinecart { private EntityTrain(World worldIn) { super(worldIn); } public static EntityTrain getEntityTrainObject(World world1n) { EntityTrain entityTrainObject = new EntityTrain(world1n); return entityTrainObject; } @Override public Type getType() { return Type.RIDEABLE; } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/entities/EntityTrain.java 0 → 100644

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/entities/ModEntities.java 0 → 100644
package com.watschman.betterenhancement.entities; import com.watschman.betterenhancement.reference.Reference; import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.EntityEntryBuilder; import net.minecraftforge.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(Reference.MOD_ID) public final class ModEntities { public static EntityEntry entityTrainTest; public static void init() { entityTrainTest = EntityEntryBuilder.create().entity(EntityTrain.class).id(Reference.MOD_ID, 0).name("entity_cart").build(); Reference.MOD_ENTITIES.add(entityTrainTest); } }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/entities/ModEntities.java 0 → 100644

Ignore Space Show notes View src/main/java/com/watschman/betterenhancement/reference/Reference.java
package com.watschman.betterenhancement.reference; import com.watschman.betterenhancement.config.ConfigEntry; import com.watschman.betterenhancement.config.ConfigurationHandler; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.EntityEntry; import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; public class Reference { public static final String MOD_ID = "betterenhancement"; public static final String MOD_NAME = "BetterEnhancement"; public static final String VERSION = "0.0.0.1-Alpha"; public static Logger MOD_LOGGER; public static final ConfigurationHandler CONFIG_INSTANCE = new ConfigurationHandler(); public static final List<Block> MOD_BLOCKS = new ArrayList<>(); public static final List<Item> MOD_ITEMS = new ArrayList<>(); public static final List<EntityEntry> MOD_ENTITIES = new ArrayList<>(); public static final List<ConfigEntry> MOD_CONFIGS = new ArrayList<>(); } package com.watschman.betterenhancement.reference; import com.watschman.betterenhancement.config.ConfigEntry; import com.watschman.betterenhancement.config.ConfigurationHandler; import net.minecraft.block.Block; import net.minecraft.item.Item; import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; public class Reference { public static final String MOD_ID = "betterenhancement"; public static final String MOD_NAME = "BetterEnhancement"; public static final String VERSION = "0.0.0.1-Alpha"; public static Logger MOD_LOGGER; public static final ConfigurationHandler CONFIG_INSTANCE = new ConfigurationHandler(); public static final List<Block> MOD_BLOCKS = new ArrayList<>(); public static final List<Item> MOD_ITEMS = new ArrayList<>(); public static final List<ConfigEntry> MOD_CONFIGS = new ArrayList<>(); }

Ignore Space Show notes View

src/main/java/com/watschman/betterenhancement/reference/Reference.java

package com.watschman.betterenhancement.reference;

import com.watschman.betterenhancement.config.ConfigEntry;
import com.watschman.betterenhancement.config.ConfigurationHandler;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.fml.common.registry.EntityEntry;
import org.apache.logging.log4j.Logger;

import java.util.ArrayList;
import java.util.List;

public class Reference {
    public static final String MOD_ID = "betterenhancement";
    public static final String MOD_NAME = "BetterEnhancement";
    public static final String VERSION = "0.0.0.1-Alpha";

public static Logger MOD_LOGGER;

public static final ConfigurationHandler CONFIG_INSTANCE = new ConfigurationHandler();

public static final List<Block> MOD_BLOCKS = new ArrayList<>();
    public static final List<Item> MOD_ITEMS = new ArrayList<>();
    public static final List<EntityEntry> MOD_ENTITIES = new ArrayList<>();

public static final List<ConfigEntry> MOD_CONFIGS = new ArrayList<>();
}

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

Ignore Space Show notes View src/main/resources/assets/betterenhancement/lang/de_de.lang 0 → 100644
# 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

Showing you all comments on commits in this comparison.