Skip to content
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.

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

Updated to work with the latest version #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/examplemod/Config.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package examplemod;

import java.io.File;
import java.util.List;

import net.minecraft.item.crafting.CraftingManager;
Expand Down Expand Up @@ -56,8 +57,8 @@ public class Config {
@BlockId(description = "The id of the block a TESR")
public static int blockWithTESRId = 1927;

public static void readConfig(Configuration configFile) {
ConfigProcessing.processAnnotations(configFile, Config.class);
public static void readConfig(File configFile, Configuration config) {
ConfigProcessing.processAnnotations(configFile, "ExampleMod", config, Config.class);
}

/***
Expand Down Expand Up @@ -112,4 +113,4 @@ public static void register() {
ConfigProcessing.registerBlocks(ExampleMod.Blocks.class, ModInfo.ID);

}
}
}
13 changes: 8 additions & 5 deletions src/examplemod/ExampleMod.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package examplemod;

import java.io.File;

import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -101,10 +103,11 @@ public ItemStack getIconItemStack() {

@EventHandler
public void preInit(FMLPreInitializationEvent evt) {
Configuration configFile = new Configuration(evt.getSuggestedConfigurationFile());
Config.readConfig(configFile);
if (configFile.hasChanged()) {
configFile.save();
File configFile = evt.getSuggestedConfigurationFile();
Configuration config = new Configuration(configFile);
Config.readConfig(configFile, config);
if (config.hasChanged()) {
config.save();
}
Config.register();

Expand All @@ -123,4 +126,4 @@ public void init(FMLInitializationEvent evt) {
public void postInit(FMLPostInitializationEvent evt) {

}
}
}
8 changes: 4 additions & 4 deletions src/examplemod/common/container/ContainerExample.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package examplemod.common.container;

import net.minecraft.inventory.IInventory;
import openmods.container.ContainerInventory;
import openmods.container.ContainerInventoryProvider;
import examplemod.common.tileentity.TileEntityWithGui;

public class ContainerExample extends ContainerInventory<TileEntityWithGui> {
public class ContainerExample extends ContainerInventoryProvider<TileEntityWithGui> {

public ContainerExample(IInventory playerInventory, TileEntityWithGui tile) {
super(playerInventory, tile);
addSlotToContainer(new RestrictedSlot(tile, 0, 62, 30));
addSlotToContainer(new RestrictedSlot(tile, 1, 100, 30));
addSlotToContainer(new RestrictedSlot(tile.getInventory(), 0, 62, 30));
addSlotToContainer(new RestrictedSlot(tile.getInventory(), 1, 100, 30));
addPlayerInventorySlots(93);
}

Expand Down
65 changes: 5 additions & 60 deletions src/examplemod/common/tileentity/TileEntityWithGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,18 @@
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import openmods.GenericInventory;
import openmods.IInventoryProvider;
import openmods.api.IHasGui;
import openmods.sync.ISyncableObject;
import openmods.sync.SyncableInt;
import openmods.tileentity.SyncedTileEntity;
import examplemod.client.gui.GuiExample;
import examplemod.common.container.ContainerExample;

public class TileEntityWithGui extends SyncedTileEntity implements IHasGui, IInventory {
public class TileEntityWithGui extends SyncedTileEntity implements IHasGui, IInventoryProvider {

private SyncableInt sliderValue;

public TileEntityWithGui() {
setInventory(new GenericInventory("example", true, 2));
}

public SyncableInt getSliderValueObject() {
return sliderValue;
}
Expand Down Expand Up @@ -57,63 +54,11 @@ protected void createSyncedFields() {
public void onSynced(Set<ISyncableObject> changes) {}

/*******************************************************
* Implemented from IInventory
* Implemented from IInventoryProvider
*******************************************************/

@Override
public int getSizeInventory() {
return inventory.getSizeInventory();
}

@Override
public ItemStack getStackInSlot(int i) {
return inventory.getStackInSlot(i);
}

@Override
public ItemStack decrStackSize(int i, int j) {
return inventory.decrStackSize(i, j);
}

@Override
public ItemStack getStackInSlotOnClosing(int i) {
return inventory.getStackInSlotOnClosing(i);
}

@Override
public void setInventorySlotContents(int i, ItemStack itemstack) {
inventory.setInventorySlotContents(i, itemstack);
}

@Override
public String getInvName() {
return inventory.getInvName();
public IInventory getInventory() {
return new GenericInventory("example", true, 2);
}

@Override
public boolean isInvNameLocalized() {
return inventory.isInvNameLocalized();
}

@Override
public int getInventoryStackLimit() {
return inventory.getInventoryStackLimit();
}

@Override
public boolean isUseableByPlayer(EntityPlayer entityplayer) {
return inventory.isUseableByPlayer(entityplayer);
}

@Override
public void openChest() {}

@Override
public void closeChest() {}

@Override
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
return inventory.isItemValidForSlot(i, itemstack);
}

}