Skip to content
This repository has been archived by the owner on Dec 19, 2020. It is now read-only.

Commit

Permalink
update fabric ver
Browse files Browse the repository at this point in the history
  • Loading branch information
squid233 committed Jul 21, 2020
1 parent 4b76de6 commit deaa8bd
Show file tree
Hide file tree
Showing 125 changed files with 183 additions and 58 deletions.
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
service_name: travis-ci
repo_token: 1kfA9pwvdwc01HxD3CGW1H40WT4VV3v0F
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: I found a bug
labels: bug
assignees: squid233

---

**Minecraft and SquidCraft version**
Tell us which version of Minecraft and SquidCraft you are using.

**Crash report**
If your game was crash, you can send crash-report to we.

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_chinese.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: 漏洞报告
about: 发现漏洞?请立即报告给我们!
title: 我发现一个漏洞
labels: bug
assignees: squid233

---

**Minecraft 与 鱿鱼工艺 的版本**
请告诉我们您的Minecraft与鱿鱼工艺的版本,我们将会对其修复!

**漏洞症状**
请告诉我们您发现的漏洞症状是如何的,例如“部分物品消失、物品没有名称等”。

**其它说明**
最好附上其它说明。让我们更了解发生的事情。
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: squid233

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/game_crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Game Crash
about: 游戏崩溃请到这里
title: 游戏崩溃
labels: bug,Influence degree : Fatal
assignees: squid233

---

**崩溃日志**
请上传您的崩溃日志。
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed ...ds/[email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed [email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed [email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed ...s/[email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .../[email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file removed .../[email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed [email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed [email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file removed [email protected]_16_1.1.16.1+build.20-v2.jar
Binary file not shown.
Binary file not shown.
Binary file added [email protected]_16_1.1.16.1+build.21-v2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
You can open new issue to tell me this project's question or bug!

# Contributors
- squid233
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SquidCraft

![https://travis-ci.org/squid233/SquidCraft.svg?branch=1.15.2](https://travis-ci.org/squid233/SquidCraft.svg)
![available for 1.16](https://img.shields.io/badge/available%20for-1.15.2%201.16-brightgreen)
![available for 1.16](https://img.shields.io/badge/available%20for-1.15.2%201.16.1-brightgreen)
![available for fabric API](https://img.shields.io/badge/available%20for-fabric%20API-brightgreen)
![MIT License](https://img.shields.io/github/license/squid233/SquidCraft)
![State:Alpha](https://img.shields.io/badge/state-Alpha-brightgreen)
Expand All @@ -27,7 +27,7 @@ squid233: ![followers](https://img.shields.io/github/followers/squid233?label=Fo

This is a Minecraft mod adds more item with squid!
这是一个Minecraft mod,它添加了许多与鱿鱼有关的东西!
See updateinfo.md!
See changelog.txt!

## Credits

Expand All @@ -51,4 +51,7 @@ fix config create and priority config create. ———— baka4n.
- MCMOD: https://www.mcmod.cn/class/2507.html
---

## API Use Guide
Please go to [here](https://scope-tech.github.io/squidcraft/api-use-guide)

###### We recommend use the Chinese or English.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx3G -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1 -Dhttps.proxyPort=7890 -Dhttp.proxyPort=7890
org.gradle.jvmargs=-Xmx1536M -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1 -Dhttps.proxyPort=7890 -Dhttp.proxyPort=7890

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.16.1
yarn_mappings=1.16.1+build.20
loader_version=0.8.9+build.203
yarn_mappings=1.16.1+build.21
loader_version=0.9.0+build.204

# Mod Properties
mod_version = 1.16-0.2.0
Expand All @@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx3G -Dhttps.proxyHost=127.0.0.1 -Dhttp.proxyHost=127.0.0.1

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.14.1+build.372-1.16
fabric_version=0.15.1+build.380-1.16
14 changes: 0 additions & 14 deletions minecraftargs

This file was deleted.

17 changes: 0 additions & 17 deletions src/main/java/io/github/squid233/api/block/Block.java

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/io/github/squid233/squidcraft/SquidCraft.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.squid233.squidcraft;

import io.github.squid233.api.util.MinecraftMod;
import io.github.squid233.squidcraft.api.util.MinecraftMod;
import io.github.squid233.squidcraft.config.CreateConfig;
import io.github.squid233.squidcraft.util.handle.LootTablesHandle;
import io.github.squid233.squidcraft.util.registers.*;
import net.fabricmc.api.ModInitializer;

import static io.github.squid233.api.util.Loggers.log;
import static io.github.squid233.squidcraft.api.util.Loggers.log;

/**
* @author squid233 and baka4n → (logger4j test)!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.github.squid233.squidcraft.api;

import io.github.squid233.api.util.Loggers;
import io.github.squid233.squidcraft.api.util.Loggers;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

import static io.github.squid233.api.util.Loggers.log;
import static io.github.squid233.squidcraft.api.util.Loggers.log;

public class BlockRegisters {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.github.squid233.squidcraft.api;

import io.github.squid233.api.util.Loggers;
import io.github.squid233.squidcraft.api.util.Loggers;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

import static io.github.squid233.api.util.Loggers.log;
import static io.github.squid233.squidcraft.api.util.Loggers.log;

/**
* items register api → (item, tool and armor) register.
Expand Down Expand Up @@ -120,12 +120,12 @@ public static Item registerSword(String modid, String name, Item item) {
}

/**
* <p>This method can collect {@linkplain io.github.squid233.api.item.Item items} and register.</p>
* <p>This method can collect {@linkplain io.github.squid233.squidcraft.api.item.Item items} and register.</p>
* @param modid Mod identifier.
* @param items The items.
*/
public static void registerAll(String modid, io.github.squid233.api.item.Item... items) {
for (io.github.squid233.api.item.Item item : items) {
public static void registerAll(String modid, io.github.squid233.squidcraft.api.item.Item... items) {
for (io.github.squid233.squidcraft.api.item.Item item : items) {
register(modid, item.getRegistryName(), item);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.squid233.api.item;
package io.github.squid233.squidcraft.api.item;

/**
* <h1>The item class</h1>
Expand All @@ -9,7 +9,7 @@
* <ol>
* <li>The 1st method:</li>
* <p>
* <code>import io.github.squid233.api.item.Item;
* <code>import io.github.squid233.squidcraft.api.item.Item;
* <br /><br />
* public class ExampleItem extends Item {<br>
* &nbsp;&nbsp;&nbsp;&nbsp;public ExampleItem(Settings settings) {<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* <p>This is the API Pack. You can import this mod to used the classes.
* The classes are very good.</p>
* <dl>
* <li>{@linkplain io.github.squid233.api.item.Item Item}</li>
* <li>{@linkplain io.github.squid233.squidcraft.api.item.Item Item}</li>
* <li>{@linkplain io.github.squid233.api.block.Block Block}</li>
* </dl>
* @author squid233
*/
package io.github.squid233.api;
package io.github.squid233.squidcraft.api;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.squid233.api.util;
package io.github.squid233.squidcraft.api.util;

import io.github.squid233.squidcraft.config.CreateConfig;
import org.apache.logging.log4j.LogManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.squid233.api.util;
package io.github.squid233.squidcraft.api.util;

import net.fabricmc.api.ModInitializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.squid233.squidcraft.item;

import io.github.squid233.api.item.Item;
import io.github.squid233.squidcraft.api.item.Item;
import io.github.squid233.squidcraft.config.CreateConfig;

import static java.lang.Integer.parseInt;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.squid233.squidcraft.item;

import io.github.squid233.api.item.Item;
import io.github.squid233.squidcraft.api.item.Item;
import io.github.squid233.squidcraft.config.CreateConfig;

public class YourItem2 extends Item {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.squid233.squidcraft.mixin;

import io.github.squid233.api.util.Loggers;
import io.github.squid233.squidcraft.api.util.Loggers;
import io.github.squid233.squidcraft.client.gui.AuthorsGui;
import io.github.squid233.squidcraft.config.CreateConfig;
import net.minecraft.client.MinecraftClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

import static io.github.squid233.api.util.Loggers.log;
import static io.github.squid233.squidcraft.api.util.Loggers.log;

/**
* You always register block, add {@link ItemGroups}, add lang, add blockstates, add models, add textures, add loot tables and add recipes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class ItemRegister {
public static final Item COOKIE_CREEPER_SPAWN_EGG;
public static final Item MILK_BUCKET;

public static final io.github.squid233.api.item.Item
public static final io.github.squid233.squidcraft.api.item.Item
YOUR_ITEM = new YourItem(),
YOUR_ITEM_2 = new YourItem2();

Expand Down Expand Up @@ -114,7 +114,7 @@ public static Item registerSword(String name, Item item) {
return ItemRegisters.registerSword(MODID, name, item);
}

private static void registerAll(io.github.squid233.api.item.Item... items) {
private static void registerAll(io.github.squid233.squidcraft.api.item.Item... items) {
ItemRegisters.registerAll(MODID, items);
}
}
Loading

0 comments on commit deaa8bd

Please sign in to comment.