dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update forge, mappings and changelog

Browse Source
This commit is contained in:
raoulvdberge
2020-04-25 21:30:26 +02:00
parent 48a1ada759
commit 4a2dbcac7c
9 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,5 +1,13 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.8.2
- Add Refined Storage silicon to forge:silicon tag for mod compatibility (jeremiahwinsley)
- Update pt_br translation (Arthur-o-b)
- Added waterlogging to all cable blocks (Darkere)
- Fixed storage block dropping extra processor (Darkere)
- Create zh_tw translation (ForFunPenguin)
- Re-added zh_cn translation (ppoozl)
### 1.8.1 ### 1.8.1
- Port to Minecraft 1.15.2 (raoulvdberge) - Port to Minecraft 1.15.2 (raoulvdberge)
- The Storage Monitor supports fluids as well now (V1RTUOZ) - The Storage Monitor supports fluids as well now (V1RTUOZ)

4
build.gradle
View File

@@ -33,7 +33,7 @@ archivesBaseName = 'refinedstorage'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft { minecraft {
mappings channel: 'snapshot', version: '20200124-1.15.1' mappings channel: 'snapshot', version: '20200225-1.15.1'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs { runs {
@@ -94,7 +94,7 @@ processResources {
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.15.2-31.0.14' minecraft 'net.minecraftforge:forge:1.15.2-31.1.39'
compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2")

2
src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java
View File

@@ -47,7 +47,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv
applyNetwork(world.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getHeldItem(hand), player.inventory.currentItem), player::sendMessage); applyNetwork(world.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getHeldItem(hand), player.inventory.currentItem), player::sendMessage);
} }
return ActionResult.func_226248_a_(stack); return ActionResult.resultSuccess(stack);
} }
public void applyNetwork(MinecraftServer server, ItemStack stack, Consumer<INetwork> onNetwork, Consumer<ITextComponent> onError) { public void applyNetwork(MinecraftServer server, ItemStack stack, Consumer<INetwork> onNetwork, Consumer<ITextComponent> onError) {

3
src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java
View File

@@ -9,7 +9,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.ITextComponent;
@@ -45,7 +44,7 @@ public class SecurityCardItem extends Item {
stack.getTag().putString(NBT_OWNER_NAME, player.getGameProfile().getName()); stack.getTag().putString(NBT_OWNER_NAME, player.getGameProfile().getName());
} }
return ActionResult.func_226248_a_(stack); return ActionResult.resultSuccess(stack);
} }
@Nullable @Nullable

2
src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java
View File

@@ -54,7 +54,7 @@ public class PortableGridBlockItem extends EnergyBlockItem {
API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, (ServerPlayerEntity) player, stack, player.inventory.currentItem); API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, (ServerPlayerEntity) player, stack, player.inventory.currentItem);
} }
return ActionResult.func_226248_a_(stack); return ActionResult.resultSuccess(stack);
} }
@Override @Override

2
src/main/java/com/raoulvdberge/refinedstorage/render/FluidRenderer.java
View File

@@ -103,7 +103,7 @@ public class FluidRenderer {
Fluid fluid = fluidStack.getFluid(); Fluid fluid = fluidStack.getFluid();
FluidAttributes attributes = fluid.getAttributes(); FluidAttributes attributes = fluid.getAttributes();
ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); ResourceLocation fluidStill = attributes.getStillTexture(fluidStack);
return Minecraft.getInstance().getTextureGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); return Minecraft.getInstance().getAtlasSpriteGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill);
} }
private static void setGLColorFromInt(int color) { private static void setGLColorFromInt(int color) {

16
src/main/java/com/raoulvdberge/refinedstorage/render/tesr/StorageMonitorTileRenderer.java
View File

@@ -87,7 +87,7 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer<StorageMonito
0, 0,
-1, -1,
false, false,
matrixStack.getLast().getPositionMatrix(), matrixStack.getLast().getMatrix(),
renderTypeBuffer, renderTypeBuffer,
false, false,
0, 0,
@@ -110,7 +110,7 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer<StorageMonito
itemStack, itemStack,
ItemCameraTransforms.TransformType.FIXED, ItemCameraTransforms.TransformType.FIXED,
light, light,
OverlayTexture.DEFAULT_LIGHT, OverlayTexture.NO_OVERLAY,
matrixStack, matrixStack,
renderTypeBuffer renderTypeBuffer
); );
@@ -130,32 +130,32 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer<StorageMonito
final Fluid fluid = fluidStack.getFluid(); final Fluid fluid = fluidStack.getFluid();
final FluidAttributes attributes = fluid.getAttributes(); final FluidAttributes attributes = fluid.getAttributes();
final ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); final ResourceLocation fluidStill = attributes.getStillTexture(fluidStack);
final TextureAtlasSprite sprite = Minecraft.getInstance().getTextureGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); final TextureAtlasSprite sprite = Minecraft.getInstance().getAtlasSpriteGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill);
final int fluidColor = attributes.getColor(fluidStack); final int fluidColor = attributes.getColor(fluidStack);
final IVertexBuilder buffer = renderTypeBuffer.getBuffer(RenderType.text(sprite.getAtlasTexture().getBasePath())); final IVertexBuilder buffer = renderTypeBuffer.getBuffer(RenderType.getText(sprite.getAtlasTexture().getTextureLocation()));
final int colorRed = fluidColor >> 16 & 0xFF; final int colorRed = fluidColor >> 16 & 0xFF;
final int colorGreen = fluidColor >> 8 & 0xFF; final int colorGreen = fluidColor >> 8 & 0xFF;
final int colorBlue = fluidColor & 0xFF; final int colorBlue = fluidColor & 0xFF;
final int colorAlpha = fluidColor >> 24 & 0xFF; final int colorAlpha = fluidColor >> 24 & 0xFF;
buffer.pos(matrixStack.getLast().getPositionMatrix(), -0.5F, -0.5F, 0F) buffer.pos(matrixStack.getLast().getMatrix(), -0.5F, -0.5F, 0F)
.color(colorRed, colorGreen, colorBlue, colorAlpha) .color(colorRed, colorGreen, colorBlue, colorAlpha)
.tex(sprite.getMinU(), sprite.getMinV()) .tex(sprite.getMinU(), sprite.getMinV())
.lightmap(light) .lightmap(light)
.endVertex(); .endVertex();
buffer.pos(matrixStack.getLast().getPositionMatrix(), 0.5F, -0.5F, 0F) buffer.pos(matrixStack.getLast().getMatrix(), 0.5F, -0.5F, 0F)
.color(colorRed, colorGreen, colorBlue, colorAlpha) .color(colorRed, colorGreen, colorBlue, colorAlpha)
.tex(sprite.getMaxU(), sprite.getMinV()) .tex(sprite.getMaxU(), sprite.getMinV())
.lightmap(light) .lightmap(light)
.endVertex(); .endVertex();
buffer.pos(matrixStack.getLast().getPositionMatrix(), 0.5F, -1.5F, 0F) buffer.pos(matrixStack.getLast().getMatrix(), 0.5F, -1.5F, 0F)
.color(colorRed, colorGreen, colorBlue, colorAlpha) .color(colorRed, colorGreen, colorBlue, colorAlpha)
.tex(sprite.getMaxU(), sprite.getMaxV()) .tex(sprite.getMaxU(), sprite.getMaxV())
.lightmap(light) .lightmap(light)
.endVertex(); .endVertex();
buffer.pos(matrixStack.getLast().getPositionMatrix(), -0.5F, -1.5F, 0F) buffer.pos(matrixStack.getLast().getMatrix(), -0.5F, -1.5F, 0F)
.color(colorRed, colorGreen, colorBlue, colorAlpha) .color(colorRed, colorGreen, colorBlue, colorAlpha)
.tex(sprite.getMinU(), sprite.getMaxV()) .tex(sprite.getMinU(), sprite.getMaxV())
.lightmap(light) .lightmap(light)

44
src/main/java/com/raoulvdberge/refinedstorage/setup/ClientSetup.java
View File

@@ -216,28 +216,28 @@ public class ClientSetup {
ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR); ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR);
ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_PORTABLE_GRID); ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_PORTABLE_GRID);
RenderTypeLookup.setRenderLayer(RSBlocks.CONTROLLER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CONTROLLER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CREATIVE_CONTROLLER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CREATIVE_CONTROLLER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CABLE, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CABLE, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER_MANAGER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTER_MANAGER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_MONITOR, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_MONITOR, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.DETECTOR, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.DETECTOR, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.DISK_MANIPULATOR, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.DISK_MANIPULATOR, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.GRID, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.GRID, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_GRID, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CRAFTING_GRID, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.PATTERN_GRID, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.PATTERN_GRID, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.FLUID_GRID, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.FLUID_GRID, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_RECEIVER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_RECEIVER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_TRANSMITTER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.NETWORK_TRANSMITTER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.RELAY, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.RELAY, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.SECURITY_MANAGER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.SECURITY_MANAGER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.WIRELESS_TRANSMITTER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.WIRELESS_TRANSMITTER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR, RenderType.getCutout());
RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR, RenderType.cutout()); RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR, RenderType.getCutout());
ClientRegistry.bindTileEntityRenderer(RSTiles.STORAGE_MONITOR, StorageMonitorTileRenderer::new); ClientRegistry.bindTileEntityRenderer(RSTiles.STORAGE_MONITOR, StorageMonitorTileRenderer::new);

4
src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
View File

@@ -230,7 +230,7 @@ public final class RenderUtils {
IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer());
MatrixStack textStack = new MatrixStack(); MatrixStack textStack = new MatrixStack();
textStack.translate(0.0D, 0.0D, (double) zLevel); textStack.translate(0.0D, 0.0D, (double) zLevel);
Matrix4f textLocation = textStack.getLast().getPositionMatrix(); Matrix4f textLocation = textStack.getLast().getMatrix();
int tooltipTop = tooltipY; int tooltipTop = tooltipY;
@@ -270,7 +270,7 @@ public final class RenderUtils {
RenderUtils.getOffsetOnScale(y - (Minecraft.getInstance().getForceUnicodeFont() ? 2 : 0), textScale), RenderUtils.getOffsetOnScale(y - (Minecraft.getInstance().getForceUnicodeFont() ? 2 : 0), textScale),
-1, -1,
true, true,
smallTextStack.getLast().getPositionMatrix(), smallTextStack.getLast().getMatrix(),
lvt_7_1_, lvt_7_1_,
false, false,
0, 0,