Skip to content

Commit

Permalink
Merge pull request #9 from GTNewHorizons/correct_render_event
Browse files Browse the repository at this point in the history
minor changes
  • Loading branch information
Dream-Master authored Jan 25, 2023
2 parents c5ba093 + a74592c commit ad06537
Show file tree
Hide file tree
Showing 179 changed files with 6,628 additions and 8,808 deletions.
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
* text eol=lf

*.[jJ][aA][rR] binary

*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary

*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary

*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary

*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary

*.[pP][aA][tT][cC][hH] -text

*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf

*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
787 changes: 609 additions & 178 deletions build.gradle

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
plugins {
id 'com.diffplug.blowdryerSetup' version '1.6.0'
}

apply plugin: 'com.diffplug.blowdryerSetup'

blowdryerSetup {
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
//devLocal '.' // Use this when testing config updates locally
}
24 changes: 8 additions & 16 deletions src/main/java/adventurebackpack/api/FluidEffect.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,42 @@
*
* @author Darkona
*/
public abstract class FluidEffect
{
public abstract class FluidEffect {
public Fluid fluid;
public int timeInSeconds;
public int timeInTicks;
public int effectID;

public FluidEffect(Fluid fluid)
{
public FluidEffect(Fluid fluid) {
this(fluid, 5);
}

public FluidEffect(Fluid fluid, int timeInSeconds)
{
public FluidEffect(Fluid fluid, int timeInSeconds) {
this.timeInSeconds = timeInSeconds;
this.fluid = fluid;
this.timeInTicks = this.timeInSeconds * 20;
this.effectID = 0;
if (!(fluid == null))
{
if (!(fluid == null)) {
com.darkona.adventurebackpack.fluids.FluidEffectRegistry.registerFluidEffect(this);
}
}

public FluidEffect(String fluidName, int timeInSeconds)
{
public FluidEffect(String fluidName, int timeInSeconds) {
Fluid fluid = FluidRegistry.getFluid(fluidName);
this.timeInSeconds = timeInSeconds;
this.fluid = fluid;
this.timeInTicks = this.timeInSeconds * 20;
this.effectID = 0;
if (!(fluid == null))
{
if (!(fluid == null)) {
com.darkona.adventurebackpack.fluids.FluidEffectRegistry.registerFluidEffect(this);
}
}

public void setEffectID(int id)
{
public void setEffectID(int id) {
effectID = id;
}

public int getEffectID()
{
public int getEffectID() {
return effectID;
}

Expand Down
50 changes: 25 additions & 25 deletions src/main/java/com/darkona/adventurebackpack/AdventureBackpack.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
package com.darkona.adventurebackpack;

import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;

import com.darkona.adventurebackpack.config.ConfigHandler;
import com.darkona.adventurebackpack.fluids.FluidEffectRegistry;
import com.darkona.adventurebackpack.handlers.ClientEventHandler;
Expand All @@ -28,29 +19,40 @@
import com.darkona.adventurebackpack.reference.LoadedMods;
import com.darkona.adventurebackpack.reference.ModInfo;
import com.darkona.adventurebackpack.reference.WailaTileAdventureBackpack;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import net.minecraftforge.common.MinecraftForge;

/**
* Created on 10/10/2014
*
* @author Javier Darkona
*/
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, guiFactory = ModInfo.GUI_FACTORY_CLASS,
@Mod(
modid = ModInfo.MOD_ID,
name = ModInfo.MOD_NAME,
version = ModInfo.MOD_VERSION,
guiFactory = ModInfo.GUI_FACTORY_CLASS,
dependencies = "required-after:CodeChickenCore@[1.0.7.47,)")
public class AdventureBackpack
{
public class AdventureBackpack {
@SidedProxy(clientSide = ModInfo.MOD_CLIENT_PROXY, serverSide = ModInfo.MOD_SERVER_PROXY)
public static IProxy proxy;

@Mod.Instance(ModInfo.MOD_ID)
public static AdventureBackpack instance;

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
//Configuration
public void preInit(FMLPreInitializationEvent event) {
// Configuration
FMLCommonHandler.instance().bus().register(new ConfigHandler());
ConfigHandler.init(event.getSuggestedConfigurationFile());

//ModStuff
// ModStuff
ModDates.init();
ModItems.init();
ModBlocks.init();
Expand All @@ -59,33 +61,31 @@ public void preInit(FMLPreInitializationEvent event)
ModEntities.init();
ModNetwork.init();

//Events
// Events
MinecraftForge.EVENT_BUS.register(new GeneralEventHandler());
MinecraftForge.EVENT_BUS.register(new ClientEventHandler());
MinecraftForge.EVENT_BUS.register(new PlayerEventHandler());
FMLCommonHandler.instance().bus().register(new PlayerEventHandler());
}

@Mod.EventHandler
public void init(FMLInitializationEvent event)
{
public void init(FMLInitializationEvent event) {
LoadedMods.init();
proxy.init();
ModRecipes.init();
ModWorldGen.init();
if (LoadedMods.WAILA) WailaTileAdventureBackpack.init();

//GUIs
// GUIs
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());
}

@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event)
{
public void postInit(FMLPostInitializationEvent event) {
GeneralReference.init();

//ConditionalFluidEffect.init();
//ModItems.conditionalInit();
//ModRecipes.conditionalInit();
// ConditionalFluidEffect.init();
// ModItems.conditionalInit();
// ModRecipes.conditionalInit();
}
}
20 changes: 7 additions & 13 deletions src/main/java/com/darkona/adventurebackpack/CreativeTabAB.java
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
package com.darkona.adventurebackpack;

import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;

import com.darkona.adventurebackpack.init.ModItems;
import com.darkona.adventurebackpack.reference.ModInfo;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;

/**
* Created on 11/10/2014.
*
* @author Javier Darkona
*/
public class CreativeTabAB
{
public static final CreativeTabs TAB_AB = new CreativeTabs(ModInfo.MOD_ID)
{
public class CreativeTabAB {
public static final CreativeTabs TAB_AB = new CreativeTabs(ModInfo.MOD_ID) {
@Override
public Item getTabIconItem()
{
public Item getTabIconItem() {
return ModItems.machete;
}

@Override
public String getTranslatedTabLabel()
{
public String getTranslatedTabLabel() {
return super.getTranslatedTabLabel();
}

@Override
public String getTabLabel()
{
public String getTabLabel() {
return ModInfo.MOD_ID;
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,38 @@
*
* @author Darkona
*/
public class BackpackMaterial extends Material
{
public BackpackMaterial()
{
public class BackpackMaterial extends Material {
public BackpackMaterial() {
super(MapColor.brownColor);
}

@Override
public boolean getCanBlockGrass()
{
public boolean getCanBlockGrass() {
return false;
}

@Override
protected Material setBurning()
{
protected Material setBurning() {
return this;
}

@Override
public boolean getCanBurn()
{
public boolean getCanBurn() {
return false;
}

@Override
public boolean isReplaceable()
{
public boolean isReplaceable() {
return false;
}

@Override
public boolean isToolNotRequired()
{
public boolean isToolNotRequired() {
return true;
}

@Override
public boolean isAdventureModeExempt()
{
public boolean isAdventureModeExempt() {
return true;
}
}
Loading

0 comments on commit ad06537

Please sign in to comment.