Skip to content

Commit

Permalink
Merge pull request #20 from asiekierka/master
Browse files Browse the repository at this point in the history
Port to 1.12.
  • Loading branch information
Vexatos authored Jun 14, 2017
2 parents 20f5221 + 6020bac commit eb01dcd
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 24 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.11-1.9"
version = "1.12-1.10"
group= "com.reddit.user.koppeh.flamingo" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Flamingo"

minecraft {
version = '1.11-13.19.0.2153'
version = '1.12-14.21.0.2324'
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = 'snapshot_20161118'
mappings = 'snapshot_20170614'
}

processResources
Expand Down
20 changes: 1 addition & 19 deletions src/main/java/com/reddit/user/koppeh/flamingo/Flamingo.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;

@Mod(modid = "flamingo", version = "1.11-1.9", useMetadata = true)
@Mod(modid = "flamingo", version = "1.12-1.10", useMetadata = true)
public class Flamingo {

@Instance("Flamingo")
Expand All @@ -31,29 +31,11 @@ public void preInit(FMLPreInitializationEvent event) {

@Mod.EventHandler
public void load(FMLInitializationEvent event) {
addRecipes();
proxy.registerRenderers();
}

private void initializeItems() {
flamingo = new BlockFlamingo();
}

private void addRecipes() {
GameRegistry.addRecipe(new ItemStack(flamingo),
" o",
"ooo",
" / ",

'o', new ItemStack(Blocks.WOOL, 1, 6),
'/', Items.STICK);
GameRegistry.addRecipe(new ItemStack(flamingo),
"o ",
"ooo",
" / ",

'o', new ItemStack(Blocks.WOOL, 1, 6),
'/', Items.STICK);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class TileEntityFlamingoRenderer extends TileEntitySpecialRenderer<TileEn
private ResourceLocation resource = new ResourceLocation("flamingo", "textures/models/flamingo.png");

@Override
public void renderTileEntityAt(TileEntityFlamingo flamingo, double x, double y, double z, float partialTicks, int destroyStage) {
public void renderTileEntityAt(TileEntityFlamingo flamingo, double x, double y, double z, float partialTicks, int destroyStage, float hi) {
int rotation = 0;
float wiggle = 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"flamingo:flamingo"
]
},
"criteria": {
"has_pink_wool": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:wool",
"data": 6
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "flamingo:flamingo"
}
}
},
"requirements": [
[
"has_pink_wool",
"has_the_recipe"
]
]
}
22 changes: 22 additions & 0 deletions src/main/resources/assets/flamingo/recipes/flamingo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"group": "flamingo",
"pattern": [
"o ",
"ooo",
" / "
],
"key": {
"o": {
"item": "minecraft:wool",
"data": 6
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "flamingo:flamingo.flamingo",
"count": 1
}
}

0 comments on commit eb01dcd

Please sign in to comment.