Skip to content

Commit

Permalink
clean, fixed stretched images on chrome
Browse files Browse the repository at this point in the history
  • Loading branch information
edeetee committed Jun 18, 2019
1 parent 88aa271 commit 5e4deb0
Show file tree
Hide file tree
Showing 16 changed files with 35 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"gradle": true,
".gradle": true,
".settings": true,
"**/node_modules": false
"**/node_modules": false,
},
"git.ignoreLimitWarning": true,
}
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway.
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

compile 'net.fabricmc:fabric-installer:+'

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
}
Expand Down Expand Up @@ -55,6 +57,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
from sourceSets.main.allSource
}


jar {
from "LICENSE"
}
Expand All @@ -79,3 +82,4 @@ publishing {
// mavenLocal()
}
}

2 changes: 2 additions & 0 deletions docs/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ body{
.picto {
margin: 1%;
width: 80px;
height: 80px;
object-fit: contain;

flex-shrink: 1;
}
Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.14.2
yarn_mappings=1.14.2+build.7
loader_version=0.4.8+build.155
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.14.2
yarn_mappings=1.14.2+build.7
loader_version=0.4.8+build.155

# Mod Properties
mod_version = 1.0.0
maven_group = net.fabricmc
archives_base_name = mc-fabric-mod
mod_version = 1.0.0
maven_group = net.fabricmc
archives_base_name = mc-fabric-mod

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.3.0+build.185
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.3.0+build.185
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ pluginManagement {
}
gradlePluginPortal()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.util.List;

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.ModInitializer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.item.Item;

public class Init implements ClientModInitializer {
public class Init implements ModInitializer {

@Override
public void onInitializeClient() {
public void onInitialize() {
// assets.minecraft.lang
// This code runs as soon as Minecraft is in a mod-load-ready state.
// However, some things (like resources) may still be uninitialized.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

import net.minecraft.block.Block;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.texture.Texture;
import net.minecraft.client.texture.TextureManager;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

public class ItemSearch {
Expand Down Expand Up @@ -77,6 +63,7 @@ static void generateMapExtras(){
}
}

//TODO: make this faster, maybe cache it?
static void generateMap(){
for (Item item : Registry.ITEM) {
if(item == Items.AIR)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.io.IOException;
import java.net.NetworkInterface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.awt.Color;
import java.awt.image.BufferedImage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL13.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft;
package edeetee.pictocraft;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.edeetee.pictocraft.mixin;
package edeetee.pictocraft.mixin;

import java.awt.Color;
import java.util.List;
Expand All @@ -10,9 +10,8 @@

import net.minecraft.client.gui.hud.ChatHud;

import net.edeetee.pictocraft.RenderUtil;

import net.edeetee.pictocraft.PictoLineRender;
import edeetee.pictocraft.RenderUtil;
import edeetee.pictocraft.PictoLineRender;

//TODO: allow users to turn off in game, display code in game

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.edeetee.pictocraft.mixin;
package edeetee.pictocraft.mixin;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.gui.hud.ChatListenerHud;

import net.edeetee.pictocraft.PictoLineRender;
import edeetee.pictocraft.PictoLineRender;

@Mixin(ChatListenerHud.class)
public abstract class MessageMixin {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"environment": "*",
"entrypoints": {
"main": [
"net.edeetee.pictocraft.Init"
"edeetee.pictocraft.Init"
]
},
"mixins": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/modid.mixins.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"required": true,
"package": "net.edeetee.pictocraft.mixin",
"package": "edeetee.pictocraft.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
],
Expand Down

0 comments on commit 5e4deb0

Please sign in to comment.