Blackfur
/
tastytoasters
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Blackfur:eaafee223bacb7750fe68095bd7b5b23e3e09c01
Branches Tags
Blackfur:main
...
compare: Blackfur:6b49ae78509c9086468bf28c588d84a90493e9b3
Branches Tags
Blackfur:main

3 Commits
eaafee223b ... 6b49ae7850

Author SHA1 Message Date
TheBlackfurGuy 6b49ae7850 added toaster block hardness and tool requirement 2021-12-04 12:03:14 +01:00
TheBlackfurGuy 8f563eea97 Merge remote-tracking branch 'origin/main' 2021-12-04 11:44:01 +01:00
TheBlackfurGuy 1f9d26c689 uhm what? 2021-12-04 11:43:52 +01:00
5 changed files with 30 additions and 23 deletions
Show Stats Expand all files Collapse all files

45
.idea/workspace.xml
View File

@ -4,26 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="9d600e86-9aa6-49ee-bbc5-e23128c6a4d1" name="Changes" comment="Basic setup">
<change afterPath="$PROJECT_DIR$/Temp/loot_tables/blocks/toasters.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Temp/minecraft/tags/blocks/mineable/pickaxe.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Temp/minecraft/tags/blocks/needs_stone_tool.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/blackfur/tastytoasters/block/ToasterBlock.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
<list default="true" id="9d600e86-9aa6-49ee-bbc5-e23128c6a4d1" name="Changes" comment="uhm what?">
<change afterPath="$PROJECT_DIR$/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/data/tastytoasters/loot_tables/blocks/toaster.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Temp/loot_tables/blocks/toasters.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Temp/minecraft/tags/blocks/mineable/pickaxe.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Temp/minecraft/tags/blocks/needs_stone_tool.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/blackfur/tastytoasters/Tastytoasters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blackfur/tastytoasters/Tastytoasters.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/assets/tastytoasters/models/block/toaster.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/assets/tastytoasters/models/block/toaster.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/data/tastytoasters/loot_tables/blocks/toasters.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/fabric.mod.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fabric.mod.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/tastytoasters.mixins.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/tastytoasters.mixins.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -103,7 +91,7 @@
<property name="project.structure.last.edited" value="Libraries" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.file-colors" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@ -189,6 +177,21 @@
<option name="presentableId" value="Default" />
<updated>1632679199302</updated>
</task>
<task id="LOCAL-00001" summary="Upgraded to 1.18">
<created>1638558511090</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1638558511090</updated>
</task>
<task id="LOCAL-00002" summary="uhm what?">
<created>1638614632820</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1638614632820</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -204,6 +207,8 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Basic setup" />
<option name="LAST_COMMIT_MESSAGE" value="Basic setup" />
<MESSAGE value="Upgraded to 1.18" />
<MESSAGE value="uhm what?" />
<option name="LAST_COMMIT_MESSAGE" value="uhm what?" />
</component>
</project>

2
src/main/java/blackfur/tastytoasters/Tastytoasters.java
View File

@ -19,7 +19,7 @@ public class Tastytoasters implements ModInitializer {
public static final Item BUTTER_ITEM = new ButterItem();
public static final Item BUTTERED_TOAST_ITEM = new ButteredToastItem();
public static final ToasterBlock TOASTER_BLOCK = new ToasterBlock(FabricBlockSettings.of(Material.METAL).hardness(4.0f));
public static final ToasterBlock TOASTER_BLOCK = new ToasterBlock(FabricBlockSettings.of(Material.METAL).hardness(4.0f).requiresTool());
@Override
public void onInitialize() {

0
Temp/minecraft/tags/blocks/mineable/pickaxe.json → src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View File

3
Temp/minecraft/tags/blocks/needs_stone_tool.json → src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
View File

@ -3,4 +3,5 @@
"values": [
"tastytoasters:toaster"
]
}
}

3
Temp/loot_tables/blocks/toasters.json → src/main/resources/data/tastytoasters/loot_tables/blocks/toaster.json
View File

@ -16,4 +16,5 @@
]
}
]
}
}